Sync with portage [Mon Apr 19 21:27:51 MSK 2021].

3 years ago · 21c11eafba
parent ed974cae49
commit 21c11eafba
127 changed files with 839 additions and 5845 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29315 BLAKE2B ff7b1d33f932c385b8803d1ab91bb1a5229dad9c6e211620af0f9a66ffa2910a7fffb0d348cf41cb41545e3408461da58be7879420407f8043e1be7311dcdc1e SHA512 e76399b3eb62940324f4833d30105db53346587ad02a7833aac4b8aeda4ab3f776ba2e541bebbdc8c4a71ae13d332b607e91713a6c9371ed97e4ce752176ed71
-TIMESTAMP 2021-04-19T11:38:38Z
+MANIFEST Manifest.files.gz 29313 BLAKE2B 18c02adc4fba83a1d98d8ed63babe16e44f8e1c0dae46a3904d3916c08bebf9bba75ae20b5fa2092a9b50f3bcc691a78941ddbc2ed30f5d575ca97521e90bdac SHA512 a74dfc928fdef4d442991594ea5bca7ac4a3883dd94aa617b9560b5055a4e965953749c6a2806709db162a7d710736ba79a160cf565050dc4f595214cafdefe5
+TIMESTAMP 2021-04-19T17:38:38Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmB9a75fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmB9wB5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDFnA/8Dol6Bs4kk6pGIGOa9rhOT9yhwvWN5hSg7KVChRFqRBI1DmsUVaOgWUF/
-0bOFoNnt/OOkT2vI6gcAnDWVtpCDeuHQ62Rm5EE1LMJm0E2WcosNhJeeotluG2DH
-86HumB/tQQu8dOhVJfMgiam9Donivb9c66JEfevZhW8c7AfEW4DmftOQqHEp8B7l
-eALZqBqLS/L9Vc+5vqI4ASKr6UJJqBQ0jVAjhd+biLGXOm0oxS62VTTz1ddZ4yNc
-xgt4tKnPteBJnnY3KGfgiuahVHT9PRY7YLXudglGY/fzzLOL8AAJQsBJBwrRGDkP
-lYI/HdXnTqI03CI/72v/hM+hZrMjflImIIs1J2Qp3l3B5XEN554yWpahDJtVmcxf
-9a82LI7FJb/E+iwvpP3nSgj9/9mjVS9zyccjenaEfSn6HaIfzuXPNbPFpHwt3G9Y
-xuadC1C9dYrR94G/x0V+wlKYOyXimB6FpYNQTi/EygtUnO/eQxZn8+2vKJUEG1+/
-2qJiprjIv1IfNy5TPUUymi78/fMxj8xK4czgOWVggz2DLhbjPeMwrx3BLDH8eM5N
-uygLcKRpqInZOUKYv29CkzgbxvfZw1bL1+QYEu5ciOyp5Tk1wLP/HOUOl19enJgl
-BRZQitXoIdY/RzVe/c1279VVcf5PMVManN9/Rcz98KKmg16x24c=
-=qSPs
+klBMIhAApDOUMTYIKODm4bC3fPY/IOaaBp74Hh6Ys3HVDZ+TIfBIyAUrb90OinHc
+Gp+4ih03xz7zgB80ALHEeGe2AqcFqF40zk1WxMvZDGut84k+gRUPeMX6H4nHK2Th
+8T85M9rqitNM5r0HX0B0XxcQpIDw2BJIrttpFa0WL9crggWtvvpBzORF5NnTcRXy
+puZAPAUo6y7zsbLW6xI9hfys1mRrjOAEHJN64k71dGY1I6L1WyHmm1GMh6PTelrI
+LWN8uQ+YxNxaRzd/jt2LSWMs5FHvjm8Vwj2YmsCL3cTOVRmWdnccvA9HCuHDU8Ti
+n82T6WksGJvWUeGGUEZYmsZ49aGqvH+tKNqFycNAXMKtIinEyGndEpm4db3UXqUe
+aNb3vTkdFHUepcCt9KVUYLRak3NQFVew/JvgEfrVq0tprYu/WtzjqpH9BiSVz1BU
+s1dFd4lTE3R4Q1NNkH8bHH4SOkf3CcVDZ51iixII5rLFS+iOCREc4MGr8lndZvsT
+bnBDLwn4NPjuMuK9bvlTme5UEIoVk/ksDAyUL3xZOmeo60U3Q729l3xcjwbIvRFs
+VbQW0tqYOz5xcWU+C1jlnkd42aS9S3Hp1c7kHLWSN6OYd9t0yS7KL9SlCv9OBA1U
+2MfaIALTQ0HTKoQV0Dg+n9YD0zWZVFMsCZOknwCxLbaKXsx6qe4=
+=Tr/5
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-cli/Manifest
+++ b/app-emulation/docker-cli/Manifest
@ -2,9 +2,11 @@ DIST docker-cli-20.10.2.tar.gz 7706210 BLAKE2B c8d537be8344dbd2113232c85a52f0012
 DIST docker-cli-20.10.3.tar.gz 7733821 BLAKE2B ab71e6817e7fe0d7c5f8c776cb25ae7bc49b5a224c835fe833988b67dfdf562207cd0afed4710d33e8a31156bd16bdc70df13f1194e862314add069c320c4e6e SHA512 769bed3e5409f6be570ab3672bef1bea4d16d5bfaeb81af8c4b3b7cfb56732c108c5404464731c001cf94fefd77c40a142bed80c85f1b058041e187453a6b88e
 DIST docker-cli-20.10.4.tar.gz 7735373 BLAKE2B 7bbdbaec4e97498c9d6aa66f9e6168afd7dc510f7746f94eff275a00bff23548562e8b879bc70c5018e0b75ebf609e0e68173bc244a441c739687d01eb8b9a3c SHA512 861f69657ac3eede228983b7d845ce98c81f4b0aa601aab37024d3f21cf1ca73a182d33bdde8fb9ad89e4954c3903dc4ec2b81fcf7364941a7c38a80ea410e34
 DIST docker-cli-20.10.5.tar.gz 7734031 BLAKE2B 3f20c5acaaa0d2fa91bf8e94f5b4b0b8ecd4d35fd3bfef3beb91f64fa832318d351bcbd4b1dac51550bc91efb748fb6d5aa4f71143001d194f066437ab3552c5 SHA512 868e19fa834993bbd20a0d28a57f364287f39434355ccf90e63f3ead8d55fe488ac3bdab3f85230bfbede318b93513536f36da131fc17c27763a5375b4e0c636
+DIST docker-cli-20.10.6.tar.gz 7684541 BLAKE2B 059f80d71b4fc5b33c54dbe322030d33385739ddb0ae78890aeadfd264d19ac6f50386a1554d9056ef6bb9138dbbb7ccdabc8b39da0075d0bd3c183333273122 SHA512 6b0ed4c756418cd38f9e5d614910a5b4fc3b2bc286f7e69950e031c5c571c705d7b7ce11cb5a7e94814cbb44fd830921a568f30ef30d783ef129c050c999666b
 EBUILD docker-cli-20.10.2.ebuild 1831 BLAKE2B f539e4dd3cc0c6ff8ce71791404f7088e15441f5462551e403d3827e0745650d6af2c0d5bc86b1980208109d8e98d8d5a3e26e4025bbc56c91e1606854600213 SHA512 252826169b64ca0c9671f70b07a61ba239dea27c16c4bfd5a0a03ea0f2451fc9a677765ee90f529b9596d87f0fe49842b4f75a6c00fda239cdc14a4cb06ce3f6
 EBUILD docker-cli-20.10.3.ebuild 1831 BLAKE2B 6ce9c4347beccedaa824ddb2b37b0507689ddf1e1c1bf4c11868597873d898e306cd7c341590cb588afdf3102c0607c2999920561ad7e76b943c098875eb8e8a SHA512 680993e4c6fb8a02a9a0a3fcd7daad9f62fab7880aa0c14eed13fab85c2d1f62584e7198e903692633c866cf64f125a26de7e2c2aae0ac502d665118761f4ca1
 EBUILD docker-cli-20.10.4.ebuild 1776 BLAKE2B 53083136fbd4ecf5a2f8fd34e00c7c460d611f3ff66c82fe5ad652a41a8b26aca7f2af430b3d6c67bf2ff0422ed69e0662dc1e86b36ccbf0ab7a13964cfb4ca1 SHA512 946b824ee14b2dac4f1ccfcb320685a150f01337dab5f65dc12eca67d54202378ca5af61d2cd8a47115eff5b48094a7548dfcc1273f1a45678c6f123f77bd65c
 EBUILD docker-cli-20.10.5-r1.ebuild 1819 BLAKE2B 53ab4574fb54a91e16126f43c012f5bfa9292951b24b812d6544bf2565ff4ad3da47b551518723d715cd4a7213e67720456ebd72dba46b8f545f6cead0a67cec SHA512 6653c99c66c64b567ebe7778c8c1c22e2a4c9e0de4af06fc38d42788852f6c8b1c71b012da9223f880665035935c758d25e0a68f863d86d8e80ede18b35ca0a4
 EBUILD docker-cli-20.10.5.ebuild 1776 BLAKE2B b4f504e3714c9938f9432a322dd9653cad6441e7e51d69ee04b29a97611f0c7adab8725decce120a9542d924420b72dac8a96f7da6e3960edfe02b14943e8ca5 SHA512 b780088e6ad3c337bd446819520bb461016be5a24a37b7c56fb9961ab499b4a6c98d340f822fd74b71a4b35f1a1949d875afcb13e7aea80eee5bb508983aadbe
+EBUILD docker-cli-20.10.6.ebuild 1819 BLAKE2B dc435cbed485445a84391851438b25e1567c799698b5d9016483fc454effd2415a7b7588da07e8ebfee160efcdbdc3c3978de416a08c8b0ed305adfaef988481 SHA512 683144a023a4b5b71b97134e0495eb56ed2e50d0d2d3f47256fc1536194744ec9246cc9a298583cc6137df3d2323b3fdb64ec5223ea8e91efa4eefb7e3b1ffa1
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
--- a/app-emulation/docker-cli/docker-cli-20.10.6.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.6.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=370c28948e
+EGO_PN="github.com/docker/cli"
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="hardened"
+
+RDEPEND="!<app-emulation/docker-20.10.1"
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	export GOPATH="${WORKDIR}/${P}"
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat VERSION)" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+
+	# build man pages
+	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+	mkdir -p ./man/man1 || die "mkdir failed"
+	go build -o "${T}"/gen-manpages ./man ||
+		die 'build gen-manpages failed'
+	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+		die 'gen-manpages failed'
+	./man/md2man-all.sh -q ||
+		die 'md2man-all.sh failed'
+}
+
+src_install() {
+	dobin build/docker
+	doman man/man*/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,5 +1,7 @@
 DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc
 DIST docker-20.10.5.tar.gz 11068359 BLAKE2B 16021065f20b6298e47f7b235f522a81ee1cbf046420edf43b241750f39ae19ddee8250090710c124ce09d9c0b20de58378b7df056b37d040a44884e32c5d12d SHA512 620a5345d99be16b4c6ba7321e91e4896128f7d638dfe2220554a6cadeb78b21dd3003cff6db60ed5ffd671ea243b310b21cc1123543b0e0cbfa93eec2900973
+DIST docker-20.10.6.tar.gz 11075291 BLAKE2B 97bc0d52af178d80701e98af7d313d1c97f0ed96d6682665415ce11976f05a5c39c52684963423e81bcf15772341a005c3bcd0ef4ab6a14da0aff1ead8fbdce2 SHA512 ade6307fe31a3b8f144898ab9c4f2db965965294f15e313b0080ce7aa8bf3296f6f34912b45926ac8c5e74eaf475eef869072878123d27aa432e955f594a94ab
 EBUILD docker-19.03.15.ebuild 9209 BLAKE2B d70f091b549c2fab56613e593ba8b7dec996b3d3e78362b338b312dc8355f7c8ca91c407432ed242ec0abfb276b17b8b07e7de19142e5d99cde527489769dce7 SHA512 c8b439a135531cdd5017d4ccbbd80529fcfcc7fc5ac158b95db41b6e4d0bf2ccbcf8d327523f015a9da022150ec9d6a67ecc06f101e3eae9e94c2908b907a9e4
 EBUILD docker-20.10.5.ebuild 7662 BLAKE2B e8ccc4b4ce92cbc7817c400bef1f72e1463338f7173d3686d1b9784a8c8ed85615adddc75c03a8ee39bce95c62bb3290f03874c30314d79c9d8f780f65a23367 SHA512 3e7637c39602259df00e49d376df4045b15eac10c2748e0664fe9adb558453ae76e5a29207c245f060b1bea559513f8b349f15c82b10ea971a9a84816871731a
+EBUILD docker-20.10.6.ebuild 7662 BLAKE2B 9bd14d42e827b0f0dbddab7a3e878a5c96f23bc17a019dc92de94899a5ebf930ebc68298c0af7fb83b4708168f5a7c11192e7739a0d2cce3e59aca5bd30532cc SHA512 b4794738635c14fd3d9be9bddb22caab77442e2059a142807030195d87a4548015d9da785de8260ee39a42f7c6b62129e51321ac337f80d7723df8a762e24cbd
 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
--- a/app-emulation/docker/docker-20.10.6.ebuild
+++ b/app-emulation/docker/docker-20.10.6.ebuild
@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+GIT_COMMIT=8728dd246c
+inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/moby/moby/tree/master//hack/dockerfile/install
+# make sure docker-proxy is pinned to exact version from ^,
+# for appropriate branchch/version of course
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	>=app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20201215
+	cli? ( app-emulation/docker-cli )
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~CGROUP_NET_PRIO
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export GOPATH="${WORKDIR}/${P}"
+	export VERSION=${PV}
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	newbin bundles/dynbinary-daemon/dockerd dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	if use cli; then
+		ewarn "Starting with docker 20.10.2, docker has been split into"
+		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn
+		ewarn "app-emulation/docker contains the daemon and"
+		ewarn "app-emulation/docker-cli contains the docker command."
+		ewarn
+		ewarn "docker currently installs docker-cli using the cli use flag."
+		ewarn
+		ewarn "This use flag is temporary, so you need to take the"
+		ewarn "following actions:"
+		ewarn
+		ewarn "First, disable the cli use flag for app-emulation/docker"
+		ewarn
+		ewarn "Then, if you need docker-cli and docker on the same machine,"
+		ewarn "run the following command:"
+		ewarn
+		ewarn "# emerge --noreplace docker-cli"
+		ewarn
+	fi
+}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@ -2,5 +2,5 @@ AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589c
 AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
 AUX alertmanager.service 730 BLAKE2B 39897ef3ae23ea477066ebbc11d26a561ad1377efd0b58a36685fd1aee4ed3ea0655f5858d41fb6e7c6a49d7695aa1d45da734f62386c4b171e1a5ef83bba289 SHA512 325f894be21dd5eb44397168591f0096a6d0adfa6ff3559541f359e72f49daf3ba08f2db33c4c3b0f0c7ff2052c56bc1f0fa99829c72430c273833013b2633d5
 DIST alertmanager-0.21.0.tar.gz 5704209 BLAKE2B 646ac0b05eb194d1c35f49e38c0a206d09a9c45d4f2f7c371a53ecfff5deba6e2c2af82f3f4ce2b591338c557241766395f42b8bd3c91ae2da4ef7e570666fda SHA512 72568407af4e90455975eff504ed49f4877eb517673532f655b6b0459725db5df7bbd1a3be120106c46b30dd7056714cc0b34b46df9c4d8c98e1f8c9eb0c39da
-EBUILD alertmanager-0.21.0-r2.ebuild 1187 BLAKE2B 138a27e405b094ce8d546fbe00837bca014bf21046472275de167d6b4b5eab8282415bac29a1fbd81c2cad43c928b845e6e6c1930c4b30d53cfa889a6a59caf2 SHA512 5514b5c10b1a7c416eb28233146b71fbf8aa82c72d75405c760fc0ede6c6740cf05fc9b79a541483e6bab24c33716ef82e2d0023af746a6f2c3cb94104a461fd
+EBUILD alertmanager-0.21.0-r3.ebuild 1186 BLAKE2B 4b588134b1f11358b4f1ba72a0509893cce688da748eedec080d7bb02a4dc3007a52a508bcd9e654fdef08729d44cb87a22c3860d050a54adc08e9f88663976b SHA512 291ecb9dcf3b4f8cf7bc38cf529962ecfb995810586e8c36bdf11d753f5ea0d5429cfbec4a8deb870a716751904bdf1d51add68bb78d1a6574a288a51fbe2d7b
 MISC metadata.xml 336 BLAKE2B 2cab21f76be9803ce08848025fd889354e4595fe5195f36361a4b5a2f2bc2e8e3e0c697fef2933db48d178d10f838a960e7ad2a8ea74bae42ebe395a6d150484 SHA512 63a13c6b9bff1f75c79b2c0cf1cb16e4973d58e666e04e1ef50bb746caaea8e5358cb61a39c257c082b67264960dbcc78da5ae24dcad94d7e72f833483c8e5bd
--- a/app-metrics/alertmanager/alertmanager-0.21.0-r3.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.21.0-r3.ebuild
@ -20,7 +20,7 @@ BDEPEND="dev-util/promu"

 RESTRICT+=" test"

-BDEPEND="
+DEPEND="
 	acct-group/alertmanager
 	acct-user/alertmanager
 "
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@ -3,5 +3,5 @@ AUX blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c6
 AUX blackbox_exporter.logrotated 107 BLAKE2B 255c64f5f0cee8b0b7a3bf2b3a55725f87f3f8067f840a94e9c70819820d1d42b3c2a7727323edf00d32797aab45060d0033fb5d5762263d502e4f0f1ad3d492 SHA512 2bb4782f925f9f416addf9f0a20ada0f0b61d964667eb8114b5fbdc758f69c07c91bf8e6fd18758d3ec21a7e41c931bd9bf42d16d3dfc45e2718126ffb0f21a6
 AUX blackbox_exporter.service 656 BLAKE2B 0c02ed1d5851215489bcaf655c290da84d3b85a852c2183bc2aa50ddcdd74beebeb09b1f1f4da4c23c0b2cfd1c72b9570303458e76651046d958ccdff77124d1 SHA512 92fd0935497f7c7df897c9dd6e5553e43be8b06e6089c78cc5891a11eb3e4bd4fdadf3f6b03f8852f544a1c33492025694408a44c6d14cddefceb60f35bd5bd0
 DIST blackbox_exporter-0.18.0.tar.gz 2614990 BLAKE2B 8c6681f3b122b3d83980c74d888442bde4bbbbd02e34a33f1560494d724f4f596e87d2b87a0702d4c860e7bbc3720d70d49d8e08ae9e74b8a6e9abed907d74bd SHA512 6579d190c755515d4e5f05e2b6ed4d811010874dba1e16eaf6052e97c655f87aec33550f22ff173d2f3bbc77d091fb4fccad059f62ca6fbb33a372d48ae692f0
-EBUILD blackbox_exporter-0.18.0.ebuild 1429 BLAKE2B 1615d27bd424cf9892ec524c4e063e25a263e77a3b6e9a42bb56e2219e53d42a9d96d638c7d3c3471a8969ab9a59ca4dc60ae6e39794a70ea6a8a2305169bceb SHA512 fba0d10784ad240c00c064ee16b60f322118fc0cd171157757826e77252950c4b1d9bf809ac86f729165646c435f0e540812544c30fd11ec20923ccf4e2b25f2
+EBUILD blackbox_exporter-0.18.0-r1.ebuild 1428 BLAKE2B 481c77bf8e79236af72a2273ecd84c576f9031abc2da3c0bcdbaf2dba9d15104ad2178e993f3637ecd98628c51d3bfddc9f16f816ed6b271675afca9b6ab4a5c SHA512 65b9a1d26187f81d4379191883e0770d53917ce04ef22d573f309c1ff98be1d3229a5f28f61ae7816b7b9eff0792cd6996d9f0ac7556872305628ae635c093b3
 MISC metadata.xml 341 BLAKE2B 30f7b2aac9cbea1444b1555a5a1279a07dfce5908bf507dff2d032daf3ecab8b98588d6e916d3e3e3cc04a5c70ed287504913f685e30aa87dcaad96abebff506 SHA512 65a7d67649765acc64976c511fc26f6f35c172538b03945367bcab3ed9c9766130c2a72a581a2e5b62068c7cf31d9ec2f39c3d7b5f580060a9e9c99035f7663f
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.18.0-r1.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.18.0-r1.ebuild
@ -17,7 +17,7 @@ LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"

-BDEPEND="
+DEPEND="
 	acct-group/blackbox_exporter
 	acct-user/blackbox_exporter
 "
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@ -1,7 +1,9 @@
 DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a
 DIST repo-2.12 43035 BLAKE2B 3a3b1997a09f08093aa2d5cf6c7a3747d6a9a6c29e6c199574757d4d87fdd57b7cc8b18bb1ddfa7c47392f73a22211f996f6ba8175448162e305106c9ac6cafe SHA512 409525040ec8fe6c6a6d923c4e23ab93f5ccc62d01d310ad6b56d55f45d88c2bf469e9b46943e799b8d5238cbc0a9610d0f64f35cf0f3a68b79cbd8c92f044a3
+DIST repo-2.14 44203 BLAKE2B 72094daad380b3a03c9dca488e0bfc2a64bcaed5b025490c07fdc627eaae825bd71d0a8aafca5307dd4a0fecf59d530e7a692b030699a2cdc34cbec569076383 SHA512 37bc4e5b63e2cb1567633708f9680817c346b8105ca495538036aad87fe278f3ab5143f0f57fd40d4051de8016cc785648e9f0b65ebf2430677f037030f71343
 DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
 EBUILD repo-2.11.ebuild 853 BLAKE2B 02d2c11fdfb03642c325252295a25563eb38b0db77814fe32ab05e7b794efa53cc7d5a3659791d7966d50099a29632a5d1bf12541d04ad2133a78cd07e21d3f0 SHA512 8d186e9c36945e862826923a0edc092098b6134594719d87e3c5fb634b6e6d2c26679a7f56bb7712f21b37826205bd58939b96c150006a27fd9bbd466c21fac6
-EBUILD repo-2.12-r1.ebuild 1257 BLAKE2B ba3e9e8ec3699b84ccd81269089cd2b1ac1e6fa9b5aed9b41646fb92d6928563a34222619029a0a77a87d8a98feff2542618bdb83e0a52b8a1ab1a6e9f7ca012 SHA512 60ccc355c32c50e37b7c8d53083e86de4c89ca1cc05598c48c3b5768a4c175e19be7ca57c7c953079b9e819f5c706651be4ea63fd3a8fb40610b41c957dd7002
+EBUILD repo-2.12-r1.ebuild 1251 BLAKE2B 26abaa9487bdcd34c73a21ff900ec8532b3b3a4652f1a968eea7331793f3aaf7d3f3d80027add1a00090c7f7e31e9c7946c036b7d32d1beb39d520222f54f594 SHA512 45945217d056597536f662b04c4b8105a6107fd0e590ed8475349d1f57a6d88fc20ba5d8b1373dbe5e4f71038e967f1f4ebe75c02b9b49c79d90523af58ddc14
 EBUILD repo-2.12.ebuild 880 BLAKE2B 5998a5fb74829aa6844f57a59131607e7f0a439195d523ca5c80e5a8be6369b66907f1b1807c2e271879a68b61be5cbc54595da8cfed2b2178addcca3a4e922b SHA512 6bb194d147b0a0ba8757bc61bab1368b547f7135040f22d6f516672b28d73575e3aaa1c3542325fab5c615e704e3dab2a363b6ae9d63476d47476c4ea670393b
+EBUILD repo-2.14.ebuild 1257 BLAKE2B ba3e9e8ec3699b84ccd81269089cd2b1ac1e6fa9b5aed9b41646fb92d6928563a34222619029a0a77a87d8a98feff2542618bdb83e0a52b8a1ab1a6e9f7ca012 SHA512 60ccc355c32c50e37b7c8d53083e86de4c89ca1cc05598c48c3b5768a4c175e19be7ca57c7c953079b9e819f5c706651be4ea63fd3a8fb40610b41c957dd7002
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
--- a/dev-vcs/repo/repo-2.12-r1.ebuild
+++ b/dev-vcs/repo/repo-2.12-r1.ebuild
@ -22,7 +22,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

--- a/dev-vcs/repo/repo-2.14.ebuild
+++ b/dev-vcs/repo/repo-2.14.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The $PV tracks the *repo launcher version*, not the last signed release
+# of the repo project.  The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 python-r1
+
+# This file rarely changes, so track it independently.
+COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10"
+COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
+	https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind
+	!dev-util/repo"
+
+S=${WORKDIR}
+
+src_unpack() {
+	base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
+}
+
+src_install() {
+	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	newbashcomp completion.bash ${PN}
+}
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@ -1,7 +1,7 @@
 AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d2ef438d68e8b6a0666fec1485152200861b4b4e32e05875a8d7115d050cc9e9030b97e8ce5a183b0f5d7aa9b8 SHA512 8e612f56a292fe3e155ab072204938888a2fda2e73559029145cdda3b4d201437e616525596610bfd7022a85ec59d761c9711732f227a335ff56040b57e94b75
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.11.tar.gz 509311523 BLAKE2B 3b08b94d81c70b13922eb31467f43d9d811a836b0861a1516678dc6de1485ac4a661bcc4d5e8c61707f07ceea552f6b8fef5e2ab40be0d93fcacdea9e30f56a7 SHA512 fc30e3e59e42f82120ad61857adac8d496b847b57316ea57a6e43212b64c05631d5e50f5fab632786da4d4265228244224033c6aa34a622a47bc530a57b7cfab
+DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27 SHA512 a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59
 EBUILD wesnoth-1.14.14.ebuild 2582 BLAKE2B 55d9b00566e58fd82d5afe249ab0885eeb1d7f25b75445bdb62a5d5adec67a506dc8192436353084c1d11fc7ff72a8042957efd25824fc9437266f4cdedb300d SHA512 18ee95ee5b9ae62b2aee00ae6f71d132d3f3075976b18c73573776f470ec814085fe1b72c693336d091fa0c25a6e8fb1c4ee7e80bf7f6c928a8ce023e9a9c21a
-EBUILD wesnoth-1.15.11.ebuild 2564 BLAKE2B c2863467c957ec039eef9ae30eb5f54c343a847127699e2bc6ca29da53d34c8de84560b4b6ee8065dcf19e62ecf5cb2e92a83e5bf723d94b5cb042e24444469c SHA512 bf40b9f35aaaa03214b91fca9d397d9f1718411878b5a783618b1bf60284da408f816a8cdfd4197de2057b2b3b9d823319c21e5baabab5b9fa109546890c4f05
+EBUILD wesnoth-1.15.12.ebuild 2456 BLAKE2B 8a30ec94fbc138e0c42e474223ebb0f416396fd5bea0f3697cd17f7919145b28d14e19e588a0f02c4722f0ba885d0c468a76b684cfd612897786114a9112e660 SHA512 c9afae51cde76444455f86cb1afbd53585306262e56889df364ee17ca7ccea2e7464bcf08a23abd650cb19b1b2993a61454192d0b9b5871e47126f2ac3435532
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
--- a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
@ -16,7 +16,7 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
+IUSE="dbus dedicated doc libressl nls server"

 RDEPEND="
 	acct-group/wesnoth
@ -30,13 +30,11 @@ RDEPEND="
 		>=media-libs/fontconfig-2.4.1
 		>=media-libs/sdl2-image-2.0.0[jpeg,png]
 		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
 		>=x11-libs/cairo-1.10.0
 		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
 	)"
 DEPEND="${RDEPEND}
 	x11-libs/libX11
@ -93,7 +91,6 @@ src_configure() {
 		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_STRICT_COMPILATION="OFF"
 		)
 	cmake_src_configure
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@ -1,4 +1,6 @@
 DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
+DIST kodi-imagedecoder-heif-1.4.0.tar.gz 32045 BLAKE2B 87da40bcb13d4ca26df4563231b08cd9535dca0197d40ed0a2baff991db05978bdaa074ce16f631822b06a660086e222427bc43fe34c153cc6eb1084f790d398 SHA512 a26fc84aeba8a9aaffde3a2187b50c99697df542faffda10b4958db1947fd9c0c4fb7cc02c2e1f959c6d3296ed47430b8d2a0be460aa497ab94fb67f1a25a8e4
 EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 884 BLAKE2B 1e69301d94bf4bf583c66ded081ff191234fdc87218e9e372c36dd0caec7368290bff4bea2e13a9fc63f2410acd0387d07ff120d038bbff383b96e910369e0a2 SHA512 5807c66ba348329784067c89ff6eab698bf3b037d7d0d9b613f604b0eb24cfeadbd7a771c129f71474ac37421288fa6d7f1781d7da5ed02b4d97befb47dd0269
-EBUILD kodi-imagedecoder-heif-9999.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
+EBUILD kodi-imagedecoder-heif-1.4.0.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
+EBUILD kodi-imagedecoder-heif-9999.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
 MISC metadata.xml 509 BLAKE2B 1d779aecbb0c70795ee2022e634922fcfd0951d654a63ebf777b6a69d9fc5c5d2404dda687de298cd81ee40f836d6088fc57136db337f2c506f65c7419a6f245 SHA512 8fee416035a69cf7391eeef4d5c679d6c4861616d6999d38d32c3ef6acf7d76ecd552b3246a125b8d026173d45b28568698bf6e61a2bfce3b3c8a6d9d4dcd2a8
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.heif"
+DESCRIPTION="HEIF image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="=media-tv/kodi-9999*"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libde265-1.0.8
+	>=media-libs/libheif-1.6.2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -18,7 +18,7 @@ case ${PV} in

 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
@ -31,7 +31,7 @@ SLOT="0"
 IUSE=""

 DEPEND+="
-	>=media-libs/libde265-1.0.5
+	>=media-libs/libde265-1.0.8
 	>=media-libs/libheif-1.6.2
 	"

--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 19 Apr 2021 11:38:34 +0000
+Mon, 19 Apr 2021 17:38:32 +0000
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@ -2,22 +2,22 @@
 Hash: SHA512

 MANIFEST Manifest.files.gz 501179 BLAKE2B 8497331f9dd69ca6298da2b244da7c443f558ba5b1a3fe30fd16624181c44f495f273604ef8a4cf26755eba9c949c383c797e8057c9baf45d23d874b04364a7a SHA512 1bcbdcac9faaadcbf738837161742f91747423833b925f90f520b0d3356096c18fcd1565918d664e0bf798a9b1b666a396108d3b8f84b2c2fd74cd3e730a319c
-TIMESTAMP 2021-04-19T11:38:37Z
+TIMESTAMP 2021-04-19T17:38:37Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmB9a71fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmB9wB1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB0OA//RZKD6ekXmYtizh3E15Jv3FyBsYHM0pg1OR2yTu00AQIPBqD8UMVFqxs4
-4L16ItKuu/VjDCs7ahJywsYlbyBJ/dHw8JuBF11aJGOBZ+R8XQmFeFXFylscLyXj
-tbfnokUeMgkQPAXvfXrxt+fF4x1Fv/Y4cdRmdAJpmrahUFMCuM3iGSkjXe2NVkxS
-tIs/TdiOnW0SqvNECaR1ecYdudAN/yiM7LNEka5gbdQxIVlbD8WjE4yVJiqvxuPp
-ytao3TUBRSPF8Tj9MpwO2I5oJrJnGhZRkRtXu+aA4KdHPvju5aN6s2zJyQC94hfW
-Y1c6AI8GV4TZKgAWEDMn+wwsNtljlx7KXMu/2fs9EF8Ltbi4LuHGbmLE/EqN/cGo
-V5ePhU/1r0Hab5k/h3GAKf8lqVE77WFgZU6PLIRhnMG2wV3VSkRmiqN6EyscavWX
-WZgKgBa8Tmq1Db6wZAYR0yg34KoUEyBwJzQCxSqn5fV5LKKXi50lFrZAul2WZJ6V
-4mDH8dciJCr4/kXl2zamy6z+noFyTPKdMREnA4LIfK76i8K8xCG5QiApAtd4YDLH
-g+zmv0MJro4Px7vi5CC5t8H1tjeFY2FIPXHhCsOdczdxINPGZsOxTSn2f2dLotvY
-E9rpCAh9cMqhWDxPnDscgV/NXG3lmziCxglO2KEDf8cPXRNAMHc=
-=HhM+
+klDmMA/9GoOxtpkgeXeWsZzOOkARZm0+PjAii6jVpMYK/JXBR3YFoVI7KJDINRoZ
+4Off+9GFQruNzi/SItQL2rVSp2ILjaHObCmyJWC63cJqzCYVuPi8hhrBTY8ZfkRU
+urtDD0XreWTUBShXRc9vsZH3LVhbpFtI86EIsG02uzHYWdcFQbcLIsoQFlogJi1s
+vIsqF9LG0+ne9I0m0ZzcX4tYOSlivVCpqntv4qz3xdyCeECURoIgmYPYE7eQ0PzV
+28SJEJeV03KQzRliufQMe39mmA2jPCgPkknErYlX+B4DAMbhY8GGrDWrtIDaLb9K
+y25zdknRJZ5/geSIIh6Y+SXrhu9qKh5GGEQn847JV9JEfbEsLBzq6IHe9CmKWO4s
+0n/qPKTVw6vuirmd0n1QgsZsjN451xSwpyThxn+cWWs7SvjwTag5Zu1AFRekTWIm
+dCY9vBotm8c7K6WUjpSdkt172k3SQ9ZZczhesksNg5AM8UYAC90e04VCALiZp61+
+qDLwyojvl9oTC4rDX8Hxl+nEg3ZlG2hziIS7bxgUWZW/0IkwHFxFwK51oErfvH1j
+sDIVCtJtzRnskzKLiKWk5t3p3lgE52RdK3FLeZUgn8mtJ4eBC9qSRJv1uJKULkNR
+0nLwNxCMPmsZeSi3Rk6eEa6Z0gSPleoWNjXjfGzSCRN3BY1GjIA=
+=jQBz
 -----END PGP SIGNATURE-----
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 19 Apr 2021 11:38:34 +0000
+Mon, 19 Apr 2021 17:38:33 +0000
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
--- a/metadata/md5-cache/app-emulation/docker-20.10.6
+++ b/metadata/md5-cache/app-emulation/docker-20.10.6
@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.13.12 dev-go/go-md2man virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20201215 cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/moby/moby/archive/v20.10.6.tar.gz -> docker-20.10.6.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=6840bb386284eca0670ee2c76282fde9
--- a/metadata/md5-cache/app-emulation/docker-cli-20.10.6
+++ b/metadata/md5-cache/app-emulation/docker-cli-20.10.6
@ -0,0 +1,14 @@
+BDEPEND=dev-go/go-md2man >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=the command line binary for docker
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=hardened
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<app-emulation/docker-20.10.1
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/cli/archive/v20.10.6.tar.gz -> docker-cli-20.10.6.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cf7d2729e9b8c208d1e40ed9b232f7bb
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
--- a/metadata/md5-cache/app-metrics/alertmanager-0.21.0-r3
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.21.0-r3
@ -1,4 +1,4 @@
-BDEPEND=acct-group/alertmanager acct-user/alertmanager >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=dev-util/promu >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare unpack
 DEPEND=>=dev-lang/go-1.11 dev-util/promu
 DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
@ -10,4 +10,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.21.0.tar.gz -> alertmanager-0.21.0.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a24267855384746f3e203eee06d1849a
+_md5_=2f22b544ae8cb7f96cb37cd72e104ff5
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.18.0-r1
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.18.0-r1
@ -1,4 +1,4 @@
-BDEPEND=acct-group/blackbox_exporter acct-user/blackbox_exporter filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare unpack
 DEPEND=dev-util/promu
 DESCRIPTION=Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP
@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.18.0.tar.gz -> blackbox_exporter-0.18.0.tar.gz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=30002baf8dda70eed382585c28c5bfbc
+_md5_=fce3043067063d7bcee54d90287230a7
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
--- a/metadata/md5-cache/dev-vcs/repo-2.12-r1
+++ b/metadata/md5-cache/dev-vcs/repo-2.12-r1
@ -3,11 +3,11 @@ DESCRIPTION=Google tool for managing git, particularly multiple repos
 EAPI=7
 HOMEPAGE=https://gerrit.googlesource.com/git-repo
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-admin/radmind !dev-util/repo
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.12 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0056145fabdf401547b6cf54b10fb6d5
+_md5_=5f957c1b50f237d5c9250e07ce7f67d1
--- a/metadata/md5-cache/dev-vcs/repo-2.14
+++ b/metadata/md5-cache/dev-vcs/repo-2.14
@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Google tool for managing git, particularly multiple repos
+EAPI=7
+HOMEPAGE=https://gerrit.googlesource.com/git-repo
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-admin/radmind !dev-util/repo
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.14 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0056145fabdf401547b6cf54b10fb6d5
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
--- a/metadata/md5-cache/games-strategy/wesnoth-1.15.12
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.12
@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
 EAPI=7
 HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls server
+IUSE=dbus dedicated doc libressl nls server
 LICENSE=GPL-2
-RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
+RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
 SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.11.tar.gz -> wesnoth-1.15.11.tar.gz
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.12.tar.gz -> wesnoth-1.15.12.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=227f35067733bdb2751074c6e306dc24
+_md5_=b315055b4f1f5cc99db6f7340408321b
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.4.0
@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
+DESCRIPTION=HEIF image decoder for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/imagedecoder.heif
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
+SLOT=0
+SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/1.4.0-Matrix.tar.gz -> kodi-imagedecoder-heif-1.4.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0bd5fd15327394a53d5f464e2a221326
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
+DEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
 DESCRIPTION=HEIF image decoder for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/imagedecoder.heif
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
+RDEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dd28b09fca241e0697c7d53f47205bc
+_md5_=0bd5fd15327394a53d5f464e2a221326
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
--- a/metadata/md5-cache/net-analyzer/cloudshark-1.0.4
+++ b/metadata/md5-cache/net-analyzer/cloudshark-1.0.4
@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Easily upload your wireshark captures to CloudShark
-EAPI=5
+EAPI=7
 HOMEPAGE=https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 PDEPEND=net-analyzer/wireshark:=[lua] net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/cloudshark/wireshark-plugin/archive/1.0.4.tar.gz -> cloudshark-1.0.4.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b458797dc545e9d5336262c546c56b70
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0ec735dff50655c8c845aea83bae0d8a
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
--- a/metadata/md5-cache/net-fs/minio-2021.03.17.02.33.02
+++ b/metadata/md5-cache/net-fs/minio-2021.03.17.02.33.02
--- a/metadata/md5-cache/net-fs/minio-2021.03.26.00.00.41
+++ b/metadata/md5-cache/net-fs/minio-2021.03.26.00.00.41
--- a/metadata/md5-cache/net-fs/minio-2021.04.06.23.11.00
+++ b/metadata/md5-cache/net-fs/minio-2021.04.06.23.11.00
--- a/metadata/md5-cache/net-fs/minio-2021.04.18.19.26.29-r1
+++ b/metadata/md5-cache/net-fs/minio-2021.04.18.19.26.29-r1
--- a/metadata/md5-cache/net-fs/samba-4.12.11
+++ b/metadata/md5-cache/net-fs/samba-4.12.11
--- a/metadata/md5-cache/net-fs/samba-4.12.12
+++ b/metadata/md5-cache/net-fs/samba-4.12.12
--- a/metadata/md5-cache/net-fs/samba-4.12.14
+++ b/metadata/md5-cache/net-fs/samba-4.12.14
--- a/metadata/md5-cache/net-fs/samba-4.13.4
+++ b/metadata/md5-cache/net-fs/samba-4.13.4
--- a/metadata/md5-cache/net-fs/samba-4.13.5
+++ b/metadata/md5-cache/net-fs/samba-4.13.5
--- a/metadata/md5-cache/net-fs/samba-4.13.7
+++ b/metadata/md5-cache/net-fs/samba-4.13.7
--- a/metadata/md5-cache/net-fs/samba-4.14.0
+++ b/metadata/md5-cache/net-fs/samba-4.14.0
--- a/metadata/md5-cache/net-fs/samba-4.14.2
+++ b/metadata/md5-cache/net-fs/samba-4.14.2
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
--- a/metadata/md5-cache/net-im/zoom-5.4.53391.1108-r3
+++ b/metadata/md5-cache/net-im/zoom-5.4.53391.1108-r3
@ -11,4 +11,4 @@ RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://zoom.us/client/5.4.53391.1108/zoom_x86_64.tar.xz -> zoom-5.4.53391.1108_x86_64.tar.xz ) x86? ( https://zoom.us/client/5.4.53391.1108/zoom_i686.tar.xz -> zoom-5.4.53391.1108_i686.tar.xz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b5a35e7bb95ff4e42d8f47de2e6d7e10
+_md5_=9e4292952e3fba8f210be83809b1ec90
--- a/metadata/md5-cache/net-im/zoom-5.6.16775.0418
+++ b/metadata/md5-cache/net-im/zoom-5.6.16775.0418
@ -9,6 +9,6 @@ LICENSE=all-rights-reserved
 RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/quazip:0= media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 wayland? ( dev-qt/qtwayland ) )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://zoom.us/client/5.6.13558.0321/zoom_x86_64.tar.xz -> zoom-5.6.13558.0321_x86_64.tar.xz
+SRC_URI=https://zoom.us/client/5.6.16775.0418/zoom_x86_64.tar.xz -> zoom-5.6.16775.0418_x86_64.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c917b1b8f25ea7d4222ae429073023c
+_md5_=65ef920c3326ff2122e1990eb9f94d3f
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
--- a/metadata/md5-cache/net-misc/croc-8.6.11
+++ b/metadata/md5-cache/net-misc/croc-8.6.11
--- a/metadata/md5-cache/net-misc/croc-9.0.0
+++ b/metadata/md5-cache/net-misc/croc-9.0.0
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
--- a/metadata/md5-cache/net-wireless/mdk-3.6-r1
+++ b/metadata/md5-cache/net-wireless/mdk-3.6-r1
@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Wireless injection tool with various functions
-EAPI=5
+EAPI=7
 HOMEPAGE=http://homepages.tu-darmstadt.de/~p_larbig/wlan
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk3-v6.tar.bz2
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3a26e70e906224e16c09f982225748ee
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a92e0326af55d8e743cce82e0971b1e7
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.23
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.23
@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst prepare setup
-DEPEND=ch-image? ( python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lark-parser[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) ) doc? ( python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) net-misc/rsync )
+DEPEND=ch-image? ( python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lark-parser[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lark-parser[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) ) doc? ( python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=7
 HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=ch-image doc python_single_target_python3_7 python_single_target_python3_8
+IUSE=ch-image doc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/hpc/charliecloud/archive/v0.21.tar.gz -> charliecloud-0.21.tar.gz
+SRC_URI=https://github.com/hpc/charliecloud/archive/v0.23.tar.gz -> charliecloud-0.23.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1494eb679a1b6c17684a5d7da3c68c30
+_md5_=56ccd9aebe8a9a2d89a33dddc53a7dc1
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure postinst prepare setup unpack
-DEPEND=ch-image? ( python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lark-parser[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) ) doc? ( python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) net-misc/rsync )
+DEPEND=ch-image? ( python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lark-parser[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lark-parser[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) ) doc? ( python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=7
 HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=ch-image doc python_single_target_python3_7 python_single_target_python3_8
+IUSE=ch-image doc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1494eb679a1b6c17684a5d7da3c68c30
+_md5_=56ccd9aebe8a9a2d89a33dddc53a7dc1
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.11.15
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.11.15
@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.11-zen2/v5.11-zen2.patch.xz
+SLOT=5.11.15
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.11.15-zen1/v5.11.15-zen1.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f24b131978600c8e8ce0a7a177ecfee
+_md5_=bedff61920e0cf134413a73e7230329b
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
--- a/metadata/md5-cache/www-client/chromium-89.0.4389.114
+++ b/metadata/md5-cache/www-client/chromium-89.0.4389.114
@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= <sys-libs/glibc-2.33 virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= <sys-libs/glibc-2.33 virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.114.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19d72cc8623baf92b5f810e04780c353
--- a/metadata/md5-cache/www-client/chromium-89.0.4389.128
+++ b/metadata/md5-cache/www-client/chromium-89.0.4389.128
@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.128.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b1d131cfadf79bf453592043203f6e0
--- a/metadata/md5-cache/www-client/chromium-90.0.4430.72
+++ b/metadata/md5-cache/www-client/chromium-90.0.4430.72
@ -5,11 +5,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-90.0.4430.72.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-90-patchset-7/chromium-90-patchset-7.tar.xz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b32a9ef2e36d06d1665ffb4a730185f9
+_md5_=159473ec1bbaad85836920f732f1a12f
--- a/metadata/md5-cache/www-client/opera-developer-77.0.4028.0
+++ b/metadata/md5-cache/www-client/opera-developer-77.0.4028.0
@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/76.0.4009.0/linux/opera-developer_76.0.4009.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/76.0.4009.0/linux/opera-developer_76.0.4009.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/76.0.4009.0/linux/opera-developer_76.0.4009.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/76.0.4009.0/linux/opera-developer_76.0.4009.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-90.0.4412.3.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/77.0.4028.0/linux/opera-developer_77.0.4028.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/77.0.4028.0/linux/opera-developer_77.0.4028.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/77.0.4028.0/linux/opera-developer_77.0.4028.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/77.0.4028.0/linux/opera-developer_77.0.4028.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4449.6.tar.xz )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a11bc34390ff66eeb40ffddf29d9781
+_md5_=bcaea4d3a550e572647a573cc4061f83
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@ -2,22 +2,22 @@
 Hash: SHA512

 MANIFEST Manifest.files.gz 10791 BLAKE2B 09f2380110aa789ac78721e30475f1299e4ad1c319c0ed4063528b8b340c6df850f9e35e6e70a46a047e16ce75eaa9e985e1d001f821e5e7f37d7e1fe907233d SHA512 ff6a62b432bda8c24c2bc9e3bee6d4c86e622637ab7796f81e9646b073e66fac67f4adcb5692f71f31fac9c31987ce0c3a4ee8ddd5532a3407abaeca2c2a8def
-TIMESTAMP 2021-04-19T11:38:37Z
+TIMESTAMP 2021-04-19T17:38:37Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmB9a71fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmB9wB1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA39Q//b2dALBq86CUNjt2ayXBaThzdfnPv5vfAJ0Qmg+zd4Z3p3dLr+j8pXaL2
-xsFlBiSeUWxuHEjpCSDuqbBsBnpInWxoaCODGoVqIwEJgRjKFtc7j2NQSUiwNgov
-8+H1hLtDTGYwIf4DP5d/XkW+1+gf0KO58LjTXCeX+/3dloBBWlSsaJvRhUoFnI4+
-S7aBA4QGuuw+uGtzO67oI97w07WV17G4H5yd6gSkW3vZ3x7fOLQ9T/jq0TDybXNL
-cMluDXXDwdAtlUQSg2Og+b4F+1nTB6e4nCkE2fGL0cR6MMGgm+CNFQKmKTBVK1Sw
-GLhJY6ESkHBRRaTL00THw8GnKs1tzOaKn3UbZ+guwLen1HEab/iZR/IvvgzErtrM
-qnOmQ+P0Wys1SFZ/kZ5a9t6vFcB5D1cLXiHZ+h19b3BDy/zqC4UL8rxb0tODsbqi
-7a00LiYtVmGmpbHzqKkaYoZl/wZZ0IWYmgkDxOuH6pVvCIujBAxtRz7ZqGGI1yIi
-CAYQIyQitdCA3Szd6yWkknVeeprqTiV9pVyaE9KJoDb4RL/4MUSrcgbxMbJ46uAz
-8S+JLkkLFGw+LANfZWU6yEmE5qZ/9bCgwbMZbn5vJkAumTIDX48Jc9RN4gPpfs0h
-W4Co39vOGQKuTw8DOS7Jr3XxtYoGiTgkJ8o3eY4AtSkR8N6bO0A=
-=MT5p
+klDhFg//YLFvUgIp8G1Y5kx/YoosxO9wTxwsUtvX95Hu+kc2Llj9VNqs/ncdfat1
+0XR6JocULMqU6hD0leY/lgD9oy9YxkXuZITOInY4G5ul/qewgZ6B8ZU+fpL75HRb
+NuZQzr/knaGHnOXejY1smx/n1MgEHNJeLmr0sqa7fTaGs6egQKlA29tXZiA8eket
+haEdu0kxgBg3M4CRVDuQqnqFFV/cis6RrobVbmnTngmNJTJ6bnTq4Scxb1c6Y0C4
+FEG/qMBl1fw2jVFBkDts1yWmMxEl5C4hTM385SeQTuKzz+I01DfPQ3EW42bgTSNk
+yToa9Smd6TS4ZW2VE/rffBnRTb70+s4CPo9yMkRwGOOMFFp//KqBPLty+qiG7SQX
+fcoYE2zWz+88JLM5HQvSs2jC9RgN6pny+wbjuF+5eDIXoTj5TnpimMGjiEDAFRJH
+CBPSwNJfrS/yP1JQF6ZIt8qw6ZxVNLnpt/ZpMeZrgorCQFBuJA0ZxGrGC2pofk9e
+vJDifHZXQM62PfE75W4W7T2eCmFnzIfbdSRr7eFOEXHE38VvkRRUril3mCLv90NP
+UPiR2EcyJ585WVD5LnAeUqEegkxEKHpOXDCpZPlAp7NULHMf4hKmQzAMQLskCblF
+RGmgNGzdUW2d89EZH3A+EW6zSr5z+7Iw06rbI8X8wJAd2sokwE8=
+=57yC
 -----END PGP SIGNATURE-----
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 19 Apr 2021 11:38:34 +0000
+Mon, 19 Apr 2021 17:38:33 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Apr 19 11:38:34 AM UTC 2021
+Mon Apr 19 05:38:32 PM UTC 2021
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@ -2809,6 +2809,7 @@
 2005110338 ./app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild
 2104051839 ./app-emulation/docker/docker-19.03.15.ebuild
 2104051839 ./app-emulation/docker/docker-20.10.5.ebuild
+2104191909 ./app-emulation/docker/docker-20.10.6.ebuild
 2104161439 ./app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
 2102142309 ./app-emulation/dynamips/dynamips-0.2.21.ebuild
 2104180939 ./app-emulation/edumips64/edumips64-1.2.ebuild
@ -3008,6 +3009,7 @@
 2104051839 ./app-emulation/docker-cli/docker-cli-20.10.4.ebuild
 2104051839 ./app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild
 2104051839 ./app-emulation/docker-cli/docker-cli-20.10.5.ebuild
+2104191909 ./app-emulation/docker-cli/docker-cli-20.10.6.ebuild
 2102260139 ./app-emulation/podman/podman-3.0.1.ebuild
 2101232309 ./app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
 2101232309 ./app-emulation/vendor-reset/vendor-reset-9999.ebuild
@ -3314,9 +3316,9 @@
 2008261609 ./app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.4.ebuild
 2008081539 ./app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild
 2103180809 ./app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild
-2104081639 ./app-metrics/alertmanager/alertmanager-0.21.0-r2.ebuild
+2104191709 ./app-metrics/alertmanager/alertmanager-0.21.0-r3.ebuild
 2005030239 ./app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
-2104091139 ./app-metrics/blackbox_exporter/blackbox_exporter-0.18.0.ebuild
+2104191709 ./app-metrics/blackbox_exporter/blackbox_exporter-0.18.0-r1.ebuild
 1912031309 ./app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild
 2012231444 ./app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
 2104122209 ./app-metrics/collectd/collectd-5.12.0-r1.ebuild
@ -16759,7 +16761,8 @@
 1703031044 ./dev-vcs/vcsh/vcsh-1.20151229.1.ebuild
 2103011939 ./dev-vcs/repo/repo-2.11.ebuild
 2103011939 ./dev-vcs/repo/repo-2.12.ebuild
-2103152109 ./dev-vcs/repo/repo-2.12-r1.ebuild
+2104192009 ./dev-vcs/repo/repo-2.12-r1.ebuild
+2104192009 ./dev-vcs/repo/repo-2.14.ebuild
 2005112339 ./dev-vcs/lab/lab-0.17.2.ebuild
 2102190039 ./dev-vcs/lab/lab-0.19.0.ebuild
 2101310343 ./dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild
@ -17592,7 +17595,7 @@
 2006280009 ./games-strategy/warzone2100/warzone2100-3.3.0.ebuild
 2101141739 ./games-strategy/warzone2100/warzone2100-3.4.1.ebuild
 2011261439 ./games-strategy/wesnoth/wesnoth-1.14.14.ebuild
-2104020109 ./games-strategy/wesnoth/wesnoth-1.15.11.ebuild
+2104191839 ./games-strategy/wesnoth/wesnoth-1.15.12.ebuild
 2101310343 ./games-strategy/widelands/widelands-0.20-r1.ebuild
 2101310343 ./games-strategy/widelands/widelands-9999.ebuild
 2104121909 ./games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@ -20268,8 +20271,9 @@
 2101310343 ./media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
 2102132309 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.3.ebuild
 2102132309 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.3.ebuild
-2007292139 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
 2009050709 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild
+2104191609 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
+2104191609 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
 2007292139 ./media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
 2009050709 ./media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild
 2007292139 ./media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-9999.ebuild
@ -21103,7 +21107,7 @@
 1811010209 ./net-analyzer/chronograf/chronograf-1.6.2.ebuild
 1811150209 ./net-analyzer/chronograf/chronograf-1.7.3.ebuild
 2007131939 ./net-analyzer/chronograf/chronograf-1.8.5.ebuild
-2104161439 ./net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
+2104191939 ./net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
 2104031909 ./net-analyzer/cnet/cnet-3.3.4.ebuild
 2104031909 ./net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
 2103160109 ./net-analyzer/cutter/cutter-1.04.ebuild
@ -21640,9 +21644,7 @@
 2103091909 ./net-fs/mc/mc-2021.03.06.22.16.44.ebuild
 2103121739 ./net-fs/mc/mc-2021.03.12.03.36.59.ebuild
 2103281109 ./net-fs/mc/mc-2021.03.23.05.46.11.ebuild
-2103212109 ./net-fs/minio/minio-2021.03.17.02.33.02.ebuild
-2103271739 ./net-fs/minio/minio-2021.03.26.00.00.41.ebuild
-2104092039 ./net-fs/minio/minio-2021.04.06.23.11.00.ebuild
+2104191709 ./net-fs/minio/minio-2021.04.18.19.26.29-r1.ebuild
 2101270639 ./net-fs/netatalk/netatalk-3.1.12-r1.ebuild
 2104100139 ./net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
 1811150109 ./net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild
@ -21652,15 +21654,10 @@
 1803201012 ./net-fs/s3backer/s3backer-1.4.5.ebuild
 2103310541 ./net-fs/s3fs/s3fs-1.86.ebuild
 2104101109 ./net-fs/s3fs/s3fs-1.89.ebuild
-2103071509 ./net-fs/samba/samba-4.12.11.ebuild
 2103071509 ./net-fs/samba/samba-4.12.9-r1.ebuild
-2103071509 ./net-fs/samba/samba-4.13.4.ebuild
-2103100039 ./net-fs/samba/samba-4.13.5.ebuild
-2103120109 ./net-fs/samba/samba-4.12.12.ebuild
-2103160009 ./net-fs/samba/samba-4.14.0.ebuild
-2103251139 ./net-fs/samba/samba-4.12.14.ebuild
-2103251139 ./net-fs/samba/samba-4.13.7.ebuild
-2103251139 ./net-fs/samba/samba-4.14.2.ebuild
+2104191509 ./net-fs/samba/samba-4.12.14.ebuild
+2104191509 ./net-fs/samba/samba-4.13.7.ebuild
+2104191509 ./net-fs/samba/samba-4.14.2.ebuild
 2101312209 ./net-fs/smbnetfs/smbnetfs-0.6.3.ebuild
 2102270939 ./net-fs/smbtad/smbtad-1.2.6.ebuild
 2012240739 ./net-fs/sshfs/sshfs-3.7.1.ebuild
@ -21771,9 +21768,9 @@
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2104122209 ./net-im/teams/teams-1.4.00.4855-r1.ebuild
 2104122209 ./net-im/teams/teams-1.4.00.7556.ebuild
-2102232309 ./net-im/zoom/zoom-5.4.53391.1108-r2.ebuild
-2103221439 ./net-im/zoom/zoom-5.6.13558.0321.ebuild
 2104011239 ./net-im/zoom/zoom-5.6.13632.0328.ebuild
+2104191939 ./net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
+2104191939 ./net-im/zoom/zoom-5.6.16775.0418.ebuild
 2102212239 ./net-im/slack/slack-4.13.0.ebuild
 2103231239 ./net-im/slack/slack-4.14.0.ebuild
 2103240939 ./net-im/slack/slack-4.12.2.ebuild
@ -22835,8 +22832,8 @@
 2104161439 ./net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
 2104161439 ./net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
 2010091139 ./net-misc/sntpd/sntpd-3.0-r1.ebuild
-2103192209 ./net-misc/croc/croc-8.6.11.ebuild
 2103271209 ./net-misc/croc/croc-8.6.12.ebuild
+2104191709 ./net-misc/croc/croc-9.0.0.ebuild
 2104042209 ./net-misc/gallery-dl/gallery-dl-1.17.1.ebuild
 2104042209 ./net-misc/gallery-dl/gallery-dl-9999.ebuild
 2104101109 ./net-misc/gallery-dl/gallery-dl-1.17.2.ebuild
@ -23242,7 +23239,7 @@
 2102171939 ./net-wireless/lorcon/lorcon-2020.06.06.ebuild
 2102171839 ./net-wireless/lorcon/lorcon-9999.ebuild
 1708061641 ./net-wireless/madwimax/madwimax-0.1.1-r1.ebuild
-2104161439 ./net-wireless/mdk/mdk-3.6-r1.ebuild
+2104191939 ./net-wireless/mdk/mdk-3.6-r1.ebuild
 2007020109 ./net-wireless/mfoc/mfoc-0.10.7-r1.ebuild
 2012040639 ./net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
 2012040639 ./net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@ -26119,9 +26116,9 @@
 2103252239 ./sys-cluster/ceph/ceph-15.2.10-r1.ebuild
 2104030739 ./sys-cluster/ceph/ceph-14.2.19.ebuild
 2104030739 ./sys-cluster/ceph/ceph-16.2.0.ebuild
-2104042209 ./sys-cluster/charliecloud/charliecloud-0.21.ebuild
 2104042209 ./sys-cluster/charliecloud/charliecloud-0.22.ebuild
-2104042209 ./sys-cluster/charliecloud/charliecloud-9999.ebuild
+2104191609 ./sys-cluster/charliecloud/charliecloud-0.23.ebuild
+2104191609 ./sys-cluster/charliecloud/charliecloud-9999.ebuild
 2104180939 ./sys-cluster/charm/charm-6.8.2.ebuild
 1702282250 ./sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
 2104161439 ./sys-cluster/cinder/cinder-16.2.1.ebuild
@ -26999,7 +26996,7 @@
 2104162009 ./sys-kernel/vanilla-sources/vanilla-sources-5.11.15.ebuild
 2104162009 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.113.ebuild
 2102192209 ./sys-kernel/zen-sources/zen-sources-5.10.16.ebuild
-2102192209 ./sys-kernel/zen-sources/zen-sources-5.11.ebuild
+2104191809 ./sys-kernel/zen-sources/zen-sources-5.11.15.ebuild
 2003261841 ./sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild
 2103191809 ./sys-kernel/installkernel-gentoo/installkernel-gentoo-3.ebuild
 2104060140 ./sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
@ -27840,10 +27837,8 @@
 1912121239 ./www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
 2104110040 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.1.6.ebuild
 2104131839 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.1.7.ebuild
-2104032039 ./www-client/chromium/chromium-89.0.4389.114.ebuild
-2104142239 ./www-client/chromium/chromium-89.0.4389.128.ebuild
-2104152009 ./www-client/chromium/chromium-90.0.4430.72.ebuild
 2104171609 ./www-client/chromium/chromium-91.0.4472.10.ebuild
+2104191609 ./www-client/chromium/chromium-90.0.4430.72.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
 2012030239 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2103301239 ./www-client/dillo/dillo-3.0.5-r3.ebuild
@ -27879,9 +27874,9 @@
 2104130239 ./www-client/netsurf/netsurf-3.10-r4.ebuild
 2104082109 ./www-client/opera-beta/opera-beta-76.0.4017.5.ebuild
 2104151939 ./www-client/opera-beta/opera-beta-76.0.4017.40.ebuild
-2103292339 ./www-client/opera-developer/opera-developer-76.0.4009.0.ebuild
 2104072309 ./www-client/opera-developer/opera-developer-76.0.4016.0.ebuild
 2104131809 ./www-client/opera-developer/opera-developer-77.0.4023.0.ebuild
+2104191909 ./www-client/opera-developer/opera-developer-77.0.4028.0.ebuild
 2104131809 ./www-client/opera/opera-75.0.3969.171.ebuild
 2101102339 ./www-client/otter/otter-1.0.02.ebuild
 2101102339 ./www-client/otter/otter-9999.ebuild
@ -32333,7 +32328,6 @@
 2104170739 metadata/md5-cache/app-emulation/lxc-4.0.6
 2104170739 metadata/md5-cache/app-emulation/lxd-4.0.4-r7
 2104170739 metadata/md5-cache/app-emulation/lxd-4.0.5
-2104180939 metadata/md5-cache/app-emulation/Manifest.gz
 2104180939 metadata/md5-cache/app-emulation/dlx-1.5.20
 2104180939 metadata/md5-cache/app-emulation/edumips64-1.2
 2104180709 metadata/md5-cache/app-emulation/libvirt-glib-3.0.0
@ -32342,6 +32336,9 @@
 2104180509 metadata/md5-cache/app-emulation/xen-4.13.3
 2104180509 metadata/md5-cache/app-emulation/xen-pvgrub-4.13.3
 2104180509 metadata/md5-cache/app-emulation/xen-tools-4.13.3
+2104191909 metadata/md5-cache/app-emulation/Manifest.gz
+2104191909 metadata/md5-cache/app-emulation/docker-20.10.6
+2104191909 metadata/md5-cache/app-emulation/docker-cli-20.10.6
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1708300239 metadata/md5-cache/app-eselect/eselect-renpy-0.7
@ -32706,13 +32703,13 @@
 2104010609 metadata/md5-cache/app-metrics/redis_exporter-1.20.0
 2104040109 metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
 2104071209 metadata/md5-cache/app-metrics/node_exporter-1.1.2-r1
-2104081639 metadata/md5-cache/app-metrics/alertmanager-0.21.0-r2
-2104091139 metadata/md5-cache/app-metrics/blackbox_exporter-0.18.0
 2104110040 metadata/md5-cache/app-metrics/fusioninventory-agent-2.5.2
 2104101539 metadata/md5-cache/app-metrics/prometheus-2.26.0
 2104092039 metadata/md5-cache/app-metrics/prometheus-bin-2.26.0
-2104122209 metadata/md5-cache/app-metrics/Manifest.gz
 2104122209 metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+2104191709 metadata/md5-cache/app-metrics/Manifest.gz
+2104191709 metadata/md5-cache/app-metrics/alertmanager-0.21.0-r3
+2104191709 metadata/md5-cache/app-metrics/blackbox_exporter-0.18.0-r1
 1806092239 metadata/md5-cache/app-misc/acdctl-1.1-r1
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
 1805222139 metadata/md5-cache/app-misc/cadubi-1.3
@ -46118,7 +46115,6 @@
 2104120016 metadata/md5-cache/dev-vcs/qgit-2.9
 2104100243 metadata/md5-cache/dev-vcs/repo-2.11
 2104100243 metadata/md5-cache/dev-vcs/repo-2.12
-2104100243 metadata/md5-cache/dev-vcs/repo-2.12-r1
 2104100243 metadata/md5-cache/dev-vcs/stgit-0.23
 2104100243 metadata/md5-cache/dev-vcs/stgit-1.0
 2104100243 metadata/md5-cache/dev-vcs/svneverever-1.5.0
@ -46136,12 +46132,14 @@
 2104161439 metadata/md5-cache/dev-vcs/mercurial-5.7
 2104161439 metadata/md5-cache/dev-vcs/mercurial-9999
 2104162139 metadata/md5-cache/dev-vcs/pre-commit-2.12.0
-2104180939 metadata/md5-cache/dev-vcs/Manifest.gz
 2104180939 metadata/md5-cache/dev-vcs/cvsspam-0.2.12
 2104180709 metadata/md5-cache/dev-vcs/gitg-3.32.1-r1
 2104180939 metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
 2104180939 metadata/md5-cache/dev-vcs/rcs-5.9.3
 2104180939 metadata/md5-cache/dev-vcs/rcs-5.9.4
+2104192009 metadata/md5-cache/dev-vcs/Manifest.gz
+2104192009 metadata/md5-cache/dev-vcs/repo-2.12-r1
+2104192009 metadata/md5-cache/dev-vcs/repo-2.14
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1707090139 metadata/md5-cache/games-action/xbomber-101-r1
 2009060239 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
@ -46975,7 +46973,6 @@
 2104120016 metadata/md5-cache/games-strategy/wargus-3.0.0-r1
 2104120016 metadata/md5-cache/games-strategy/warzone2100-3.4.1
 2104120016 metadata/md5-cache/games-strategy/wesnoth-1.14.14
-2104120016 metadata/md5-cache/games-strategy/wesnoth-1.15.11
 2104120016 metadata/md5-cache/games-strategy/widelands-0.20-r1
 2104120016 metadata/md5-cache/games-strategy/widelands-9999
 2104121341 metadata/md5-cache/games-strategy/dopewars-1.6.1
@ -46988,7 +46985,8 @@
 2104161439 metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
 2104161439 metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
 2104190739 metadata/md5-cache/games-strategy/triplea-1.8.0.9-r2
-2104191109 metadata/md5-cache/games-strategy/Manifest.gz
+2104191839 metadata/md5-cache/games-strategy/Manifest.gz
+2104191839 metadata/md5-cache/games-strategy/wesnoth-1.15.12
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1702282323 metadata/md5-cache/games-util/gslist-0.8.11a-r1
 1907151840 metadata/md5-cache/games-util/uglygs-0_rc11-r1
@ -49438,7 +49436,6 @@
 2104120016 metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.117
 2104120016 metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
 2104120016 metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0
-2104120016 metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
 2104120016 metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1
 2104120016 metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
 2104120016 metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@ -49699,12 +49696,14 @@
 2104161439 metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1
 2104161439 metadata/md5-cache/media-plugins/tap-plugins-1.0.1
 2104161439 metadata/md5-cache/media-plugins/tap-plugins-9999
-2104181439 metadata/md5-cache/media-plugins/Manifest.gz
 2104180939 metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
 2104180939 metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
 2104180709 metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
 2104181439 metadata/md5-cache/media-plugins/x42-plugins-20210409
 2104181439 metadata/md5-cache/media-plugins/x42-plugins-9999
+2104191609 metadata/md5-cache/media-plugins/Manifest.gz
+2104191609 metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.4.0
+2104191609 metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@ -50853,7 +50852,6 @@
 2104160839 metadata/md5-cache/net-analyzer/tcpdump-9999
 2104160839 metadata/md5-cache/net-analyzer/wireshark-3.4.4
 2104160909 metadata/md5-cache/net-analyzer/wireshark-9999
-2104161439 metadata/md5-cache/net-analyzer/cloudshark-1.0.4
 2104161439 metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
 2104161439 metadata/md5-cache/net-analyzer/greenbone-security-assistant-20.8.1
 2104161439 metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
@ -50868,7 +50866,6 @@
 2104170739 metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
 2104170739 metadata/md5-cache/net-analyzer/linkchecker-10.0.1
 2104170739 metadata/md5-cache/net-analyzer/linkchecker-9999
-2104190439 metadata/md5-cache/net-analyzer/Manifest.gz
 2104190039 metadata/md5-cache/net-analyzer/knocker-0.8.0
 2104181109 metadata/md5-cache/net-analyzer/munin-2.0.67-r1
 2104190439 metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
@ -50877,6 +50874,8 @@
 2104190039 metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1
 2104180939 metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
 2104190339 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
+2104191939 metadata/md5-cache/net-analyzer/Manifest.gz
+2104191939 metadata/md5-cache/net-analyzer/cloudshark-1.0.4
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2012311940 metadata/md5-cache/net-dialup/ppp-scripts-0
 2012311940 metadata/md5-cache/net-dialup/wvdial-1.61
@ -51056,24 +51055,12 @@
 2103310520 metadata/md5-cache/net-fs/autofs-5.1.6-r1
 2103310520 metadata/md5-cache/net-fs/autofs-5.1.7
 2103310541 metadata/md5-cache/net-fs/docker-volume-netshare-0.35
-2103301639 metadata/md5-cache/net-fs/minio-2021.03.17.02.33.02
-2103301639 metadata/md5-cache/net-fs/minio-2021.03.26.00.00.41
 2104120016 metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
 2104120016 metadata/md5-cache/net-fs/cvmfs-2.7.3
-2104092039 metadata/md5-cache/net-fs/minio-2021.04.06.23.11.00
-2104120442 metadata/md5-cache/net-fs/samba-4.12.11
-2104120442 metadata/md5-cache/net-fs/samba-4.12.12
-2104120442 metadata/md5-cache/net-fs/samba-4.12.14
 2104120442 metadata/md5-cache/net-fs/samba-4.12.9-r1
-2104120442 metadata/md5-cache/net-fs/samba-4.13.4
-2104120442 metadata/md5-cache/net-fs/samba-4.13.5
-2104120442 metadata/md5-cache/net-fs/samba-4.13.7
-2104120442 metadata/md5-cache/net-fs/samba-4.14.0
-2104120442 metadata/md5-cache/net-fs/samba-4.14.2
 2104120442 metadata/md5-cache/net-fs/smbtad-1.2.6
 2104100243 metadata/md5-cache/net-fs/sshfs-3.7.0
 2104100243 metadata/md5-cache/net-fs/sshfs-3.7.1
-2104121341 metadata/md5-cache/net-fs/Manifest.gz
 2104121341 metadata/md5-cache/net-fs/btfs-2.22
 2104121341 metadata/md5-cache/net-fs/btfs-2.23
 2104121341 metadata/md5-cache/net-fs/cifs-utils-6.11
@ -51089,6 +51076,11 @@
 2104121341 metadata/md5-cache/net-fs/s3backer-1.4.5
 2104121341 metadata/md5-cache/net-fs/s3fs-1.86
 2104121341 metadata/md5-cache/net-fs/s3fs-1.89
+2104191709 metadata/md5-cache/net-fs/Manifest.gz
+2104191709 metadata/md5-cache/net-fs/minio-2021.04.18.19.26.29-r1
+2104191509 metadata/md5-cache/net-fs/samba-4.12.14
+2104191509 metadata/md5-cache/net-fs/samba-4.13.7
+2104191509 metadata/md5-cache/net-fs/samba-4.14.2
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2009300009 metadata/md5-cache/net-ftp/uftpd-2.13
 2012231444 metadata/md5-cache/net-ftp/tnftp-20141104
@ -51129,9 +51121,7 @@
 2102160539 metadata/md5-cache/net-im/centerim-5.0.1-r1
 2102241139 metadata/md5-cache/net-im/signal-cli-bin-0.8.0
 2102241843 metadata/md5-cache/net-im/dianara-1.4.2
-2102241843 metadata/md5-cache/net-im/zoom-5.4.53391.1108-r2
 2103171739 metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2
-2103221439 metadata/md5-cache/net-im/zoom-5.6.13558.0321
 2103310849 metadata/md5-cache/net-im/discord-bin-0.0.14
 2103310849 metadata/md5-cache/net-im/element-desktop-bin-1.7.22
 2103310849 metadata/md5-cache/net-im/gitter-bin-4.1.0-r1
@ -51201,13 +51191,15 @@
 2104170739 metadata/md5-cache/net-im/slack-4.14.0
 2104170739 metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1
 2104170739 metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1
-2104180709 metadata/md5-cache/net-im/Manifest.gz
 2104180709 metadata/md5-cache/net-im/corebird-1.7.4-r1
 2104180709 metadata/md5-cache/net-im/dino-0.1.0
 2104180709 metadata/md5-cache/net-im/dino-0.2.0
 2104180709 metadata/md5-cache/net-im/dino-9999
 2104172239 metadata/md5-cache/net-im/minbif-1.0.5-r3
 2104172309 metadata/md5-cache/net-im/openmittsu-0.9.15.0
+2104191939 metadata/md5-cache/net-im/Manifest.gz
+2104191939 metadata/md5-cache/net-im/zoom-5.4.53391.1108-r3
+2104191939 metadata/md5-cache/net-im/zoom-5.6.16775.0418
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
 2002112051 metadata/md5-cache/net-irc/muh-2.2a-r1
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
@ -51865,7 +51857,6 @@
 2103310520 metadata/md5-cache/net-misc/cni-plugins-0.8.7
 2103310520 metadata/md5-cache/net-misc/cni-plugins-0.9.0
 2103310520 metadata/md5-cache/net-misc/cni-plugins-0.9.1
-2103311110 metadata/md5-cache/net-misc/croc-8.6.11
 2103311110 metadata/md5-cache/net-misc/croc-8.6.12
 2103301639 metadata/md5-cache/net-misc/dhcpcd-9.4.0
 2103301639 metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1
@ -52247,7 +52238,6 @@
 2104170939 metadata/md5-cache/net-misc/youtube-dl-2021.04.17
 2104170739 metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
 2104170739 metadata/md5-cache/net-misc/youtube-viewer-9999
-2104190739 metadata/md5-cache/net-misc/Manifest.gz
 2104181009 metadata/md5-cache/net-misc/connect-1.105
 2104180509 metadata/md5-cache/net-misc/curl-7.74.0-r2
 2104180509 metadata/md5-cache/net-misc/curl-7.74.0-r4
@ -52282,6 +52272,8 @@
 2104180939 metadata/md5-cache/net-misc/teamviewer-15.15.5
 2104180709 metadata/md5-cache/net-misc/vinagre-3.22.0-r3
 2104180509 metadata/md5-cache/net-misc/youtube-dl-2021.04.07
+2104191709 metadata/md5-cache/net-misc/Manifest.gz
+2104191709 metadata/md5-cache/net-misc/croc-9.0.0
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2012311940 metadata/md5-cache/net-nds/gssproxy-0.8.3
@ -52757,7 +52749,6 @@
 2104161439 metadata/md5-cache/net-wireless/crackle-9999
 2104161439 metadata/md5-cache/net-wireless/kismet-2020.12.3
 2104161439 metadata/md5-cache/net-wireless/kismet-9999
-2104161439 metadata/md5-cache/net-wireless/mdk-3.6-r1
 2104161439 metadata/md5-cache/net-wireless/spectools-2016.01.1
 2104161439 metadata/md5-cache/net-wireless/spectools-9999
 2104161439 metadata/md5-cache/net-wireless/urh-2.9.1
@ -52765,12 +52756,13 @@
 2104161439 metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
 2104161439 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
 2104162239 metadata/md5-cache/net-wireless/unifi-6.2.19
-2104182009 metadata/md5-cache/net-wireless/Manifest.gz
 2104180209 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
 2104180939 metadata/md5-cache/net-wireless/unifi-6.0.45
 2104180939 metadata/md5-cache/net-wireless/unifi-6.1.71
 2104180939 metadata/md5-cache/net-wireless/unifi-6.2.17
 2104182009 metadata/md5-cache/net-wireless/yatebts-9999
+2104191939 metadata/md5-cache/net-wireless/Manifest.gz
+2104191939 metadata/md5-cache/net-wireless/mdk-3.6-r1
 2104110040 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
 2104110040 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2104120442 metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
@ -55771,11 +55763,8 @@
 2104161439 metadata/md5-cache/sys-cluster/swift-2021.1.9999
 2104161439 metadata/md5-cache/sys-cluster/torque-4.2.10-r1
 2104162139 metadata/md5-cache/sys-cluster/singularity-3.7.3
-2104170739 metadata/md5-cache/sys-cluster/charliecloud-0.21
 2104170739 metadata/md5-cache/sys-cluster/charliecloud-0.22
-2104170739 metadata/md5-cache/sys-cluster/charliecloud-9999
 2104170739 metadata/md5-cache/sys-cluster/vzctl-4.9.4
-2104190039 metadata/md5-cache/sys-cluster/Manifest.gz
 2104180939 metadata/md5-cache/sys-cluster/charm-6.8.2
 2104190039 metadata/md5-cache/sys-cluster/gmqtt-0.3.1
 2104180939 metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@ -55808,6 +55797,9 @@
 2104180939 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
 2104180939 metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
 2104180939 metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
+2104191609 metadata/md5-cache/sys-cluster/Manifest.gz
+2104191609 metadata/md5-cache/sys-cluster/charliecloud-0.23
+2104191609 metadata/md5-cache/sys-cluster/charliecloud-9999
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
 2002112051 metadata/md5-cache/sys-devel/ct-ng-1.24.0
@ -56360,7 +56352,6 @@
 2103310520 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
 2103310849 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
 2103310520 metadata/md5-cache/sys-kernel/zen-sources-5.10.16
-2103310520 metadata/md5-cache/sys-kernel/zen-sources-5.11
 2104012209 metadata/md5-cache/sys-kernel/cryptodev-1.11
 2104012209 metadata/md5-cache/sys-kernel/cryptodev-1.12
 2104021309 metadata/md5-cache/sys-kernel/linux-headers-4.9
@ -56503,7 +56494,6 @@
 2104170209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.31
 2104170209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.15
 2104170209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.113
-2104190139 metadata/md5-cache/sys-kernel/Manifest.gz
 2104180539 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.30-r1
 2104180539 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.31-r1
 2104180539 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.14-r1
@ -56514,6 +56504,8 @@
 2104180939 metadata/md5-cache/sys-kernel/mips-sources-4.14.227
 2104180939 metadata/md5-cache/sys-kernel/mips-sources-4.19.183
 2104180939 metadata/md5-cache/sys-kernel/mips-sources-5.4.108
+2104191809 metadata/md5-cache/sys-kernel/Manifest.gz
+2104191809 metadata/md5-cache/sys-kernel/zen-sources-5.11.15
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@ -57314,7 +57306,6 @@
 2103310520 metadata/md5-cache/www-client/firefox-bin-78.9.0
 2103310520 metadata/md5-cache/www-client/firefox-bin-87.0
 2103310849 metadata/md5-cache/www-client/luakit-9999
-2103310849 metadata/md5-cache/www-client/opera-developer-76.0.4009.0
 2103310849 metadata/md5-cache/www-client/surf-2.0
 2103310849 metadata/md5-cache/www-client/surf-9999
 2103310849 metadata/md5-cache/www-client/vivaldi-3.6.2165.40
@ -57324,7 +57315,6 @@
 2104072309 metadata/md5-cache/www-client/opera-developer-76.0.4016.0
 2104081209 metadata/md5-cache/www-client/microsoft-edge-dev-91.0.845.2
 2104082109 metadata/md5-cache/www-client/opera-beta-76.0.4017.5
-2104120016 metadata/md5-cache/www-client/chromium-89.0.4389.114
 2104100243 metadata/md5-cache/www-client/epiphany-3.34.4
 2104100243 metadata/md5-cache/www-client/epiphany-3.36.4
 2104120016 metadata/md5-cache/www-client/falkon-3.1.0-r1
@ -57353,11 +57343,9 @@
 2104121341 metadata/md5-cache/www-client/uget-9999
 2104121341 metadata/md5-cache/www-client/w3m-0.5.3_p20180125
 2104121341 metadata/md5-cache/www-client/w3m-0.5.3_p20190105
-2104142239 metadata/md5-cache/www-client/chromium-89.0.4389.128
 2104151039 metadata/md5-cache/www-client/google-chrome-90.0.4430.72
 2104142239 metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.72
 2104151139 metadata/md5-cache/www-client/seamonkey-2.53.7.1
-2104152009 metadata/md5-cache/www-client/chromium-90.0.4430.72
 2104160009 metadata/md5-cache/www-client/google-chrome-unstable-91.0.4472.10
 2104151939 metadata/md5-cache/www-client/opera-beta-76.0.4017.40
 2104160409 metadata/md5-cache/www-client/seamonkey-2.53.7
@ -57373,11 +57361,13 @@
 2104180509 metadata/md5-cache/www-client/links-2.22
 2104180709 metadata/md5-cache/www-client/midori-9.0
 2104180939 metadata/md5-cache/www-client/netrik-1.16.1-r1
-2104191139 metadata/md5-cache/www-client/Manifest.gz
 2104191139 metadata/md5-cache/www-client/firefox-78.10.0
 2104191139 metadata/md5-cache/www-client/firefox-88.0
 2104191139 metadata/md5-cache/www-client/firefox-bin-78.10.0
 2104191139 metadata/md5-cache/www-client/firefox-bin-88.0
+2104191909 metadata/md5-cache/www-client/Manifest.gz
+2104191609 metadata/md5-cache/www-client/chromium-90.0.4430.72
+2104191909 metadata/md5-cache/www-client/opera-developer-77.0.4028.0
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@ -58797,4 +58787,4 @@
 2104180709 metadata/md5-cache/xfce-extra/Manifest.gz
 2104180709 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0
 2104180709 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r7
-2104191439 metadata/md5-cache/Manifest.gz
+2104192009 metadata/md5-cache/Manifest.gz
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 19 Apr 2021 12:00:01 +0000
+Mon, 19 Apr 2021 18:00:01 +0000
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@ -1 +1 @@
-9a0501f1ddb6da4857bdfffaaca5045327513f2b 1618830954 2021-04-19T11:15:54+00:00
+55c495db54a1520e86cec6d572d388581b70fb8f 1618851658 2021-04-19T17:00:58+00:00
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1618832101 Mon 19 Apr 2021 11:35:01 AM UTC
+1618853701 Mon 19 Apr 2021 05:35:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Mon, 19 Apr 2021 11:38:34 +0000
+Mon, 19 Apr 2021 17:38:32 +0000
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
--- a/net-analyzer/cloudshark/Manifest
+++ b/net-analyzer/cloudshark/Manifest
@ -1,4 +1,4 @@
 AUX cs_log_dir.patch 402 BLAKE2B 4605bc98eaa08729d8b622f212941dd7eb7b99654f2e74aa87460abbe4348b09e666fb6ec413f77fa9123ef22b00363d61610777824272758745f90c588dfd6e SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9
 DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86
-EBUILD cloudshark-1.0.4.ebuild 1262 BLAKE2B e5bc4dcd985e79d6fb92538c5fbf95eacd76e8c7a2cb3b23577c249733a0187d49c6d44822a7aea4c20aa2f0285e2aa29a2f3d9f50d1ace4afe33c8931e8d09a SHA512 faecd53b2d9372df55fe0b4d84726c6b5e0df2029197086a33764667ecf05605c7fd45b70590502257eed908aaa426f425fccf868d495983da445f3a861f87b1
+EBUILD cloudshark-1.0.4.ebuild 1264 BLAKE2B 00868eeda28fd8e1975f18b947bc5b6141ee1b252f87420741a4888a8044ec723a11649e8ea1f14fc174d0f6e044cd2adf789a8b0e25d4e1ed68dc08572d1716 SHA512 0192f79963684e1f93fc9041360d57b6e6b6caa99a126fff90b4ef6e0fab7f6e0e73eecdd8e41624c07914d1e8f2a51ad47f82399f7c39c04a2b5d547c9756cd
 MISC metadata.xml 339 BLAKE2B 9cb074760517267c2a84e4c538b7cc645727acfd7b0d738b905d51e38be2bebdef41dbe689e6272af890ea898c8260da2ec96c5c72e175bbebc916f101f83d08 SHA512 9b0f0f90882087febab5d144d1bdbf93db3533369f54bd7213ac781cd2eed2d81dae345e965f5c31d4f9e8c4fdd2c66d0587c9bc53bab8d207a4e6dd16e0d9d3
--- a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
+++ b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-inherit epatch multilib
+inherit multilib

 DESCRIPTION="Easily upload your wireshark captures to CloudShark"
 HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin"
@ -27,12 +27,13 @@ get_PV() {

 src_prepare() {
 	#cloudshark isn't meant to be installed systemwide, we fix that
-	epatch "${FILESDIR}"/cs_log_dir.patch
+	eapply "${FILESDIR}"/cs_log_dir.patch

 	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua

 	#this enables cloudshark by DEFAULT on tshark, not desired
 	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default
+	default
 }

 src_install() {
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@ -170,8 +170,8 @@ DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod 215 BLAKE2B 0077e3bcaad8a354f484c15844594107eb1a56d551e7ec55cd75e4594e50af02fe3850d9d212b0bc425da71c20bfd7dd470aa37be046b4eb88c28cb6bb63bb53 SHA512 8f928dfbe495a84c91744bf72527c5662422e608125f8b58908803289a39abfec1823d4628a52b987ab5150103ca588509ae0074fb08799d075e7ffc4157dc33
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip 2700673 BLAKE2B 84605b73500cebee7cae122f45003110ec3a50074d0649b9e7e1e25915b1c5e789017c628e8305523edb28d8f93733b9032f5b20a186b4cba4a38f90c0add6b6 SHA512 5d27fdbda403bc5ca722280af1fc331e48e45dc97d6e0b9f99f0d48d2d173292ae88904236f43851173528d0523fca86dc15a633dae218bbe05bc0fc22e1d477
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
@ -204,7 +204,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip 128896 BLAKE2B 4981d158f2cbe026d5b56192173ff9da3ee72a91c766235e485530d30524066f4c619e7beb7e8daaf8f38746239516e754be3915126a908910faa812fcc55b38 SHA512 371abaf9db7012c40704d4f5ff322dafa27211f434b477a632f88e57db3f2cda168cef55c293262425a1039caed3bee9a65d48fa8b3d71680d66d3cc041de845
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
@ -333,13 +334,12 @@ DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8c
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
-DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.zip 17541736 BLAKE2B 16fd15530761c37fbfe4479bea982e5671bee792e8f0f92bdf3b7829c60c0f21d6c965fb963cbc3b330de7ef4d6d1619658b762321d6c7b37b527b3b1f1f7238 SHA512 2242dfe6afe921cb6d2e1a6e254e5bc27f135adda1d9211ae18338d358e724a0833830906858a6fd7cc8eeff36f9f5620c6486a117c0dd8c3d5013b0c0da6f46
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.zip 17534766 BLAKE2B 9449a00a40cad1a8926576d04ab3da6fb68aef403d207f22878ed8ef42c3e35e5b66fa1bce5ca674eed715a218e637d9b3b2721f1234d076f11fce719f8874df SHA512 4fb82bf9208a83e0a1ac5d9fefc76a4f4c93b46acf6a3eb92b8280c2401a590747542d7af29828919bb3fbb1bab9679d94978aa3d900af7899fdf1bec81c9e8f
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip 377696 BLAKE2B e61d2572e080ddf8195c86101ba7995c38c124b4eaa918edc9b082448ea0f1ca44b6fca9788277aad332f7786577f6fe52e6c9d4b702c6773a7cecac7ef9f2c4 SHA512 4e191b6dce1ec399df8ed24ec2fd6756f2ec048741005256f076af6b127d43753f3ca0cda89c4f50bd0555b8a830d4994ddfe7cbf00d6e3fef905fbc782667a8
@ -363,8 +363,8 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7cce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
-DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
-DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip 118447 BLAKE2B 35bf2178c21f6b65693863db7160f4e2392b3525ca9d51db07c64eb026e736cc346009cf8b9b9a0415386c7792833ffe3715ce9658a2e0bdcff8162b7ace7829 SHA512 d01f415ee9e59e1e9b9d8d55a4f79b508aa871ea1106686defab608b6f2c76223e0b85bf7aef3b098b12cf66de89be5767180789691c1abe17680defedf408f4
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.9.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.9.0.zip 119998 BLAKE2B 01d4ce1e7a1a888d04fc3b7947ebd1936d25e6557a8e804aa739e7fd9cc86f3f435e0ff2c4c2e3365779b31bbe3130d39c47576f738ac07b0faa8f887a8be571 SHA512 dfbf3b0c8e5be77a95b07c36af9eefde999f91f8b7aca86ceef2f7bee73bfa167e6e5a1a0658dd35b15b73d78d24a06161af88fc461e1eb840802eaf66c84d5a
 DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
 DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
 DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
@ -396,8 +396,6 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.mod 333 BLAKE2B 8d0eee290f65ec90aa7
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.zip 234123 BLAKE2B d287872e0fec17c5a9639bb4e1eae9f1d7e15bd319cd8e50c784e935a19a079879b4c05a6306345f27aa81a49b134d23c796974b47d89cc712255d5e29933795 SHA512 bbc4ab20114482359ee6449f07a65971bf0f55b262b68c3bc2a22a6b4c299aa44db815f8ce5434d24761593a13fa59e1520e76b5684254212c82e78b69d28e13
 DIST github.com%2Fminio%2Fcli%2F@v%2Fv1.22.0.mod 142 BLAKE2B ef1038181556372f9179bb6bba965e968b70a8b26585cdcb9493061a7c36242ee722e8f498d1ea51ad0e771325bc7b849f716e4952e916e9fbccd432fbeca284 SHA512 c1b9ec0271ab06f698c558c6a1e6469f485c36fa94f101ccaddfc5eeb52b6a88f1783f0aaa16ac0f86d4a173ccd9a1be9c209eb07421c61171178084e6d7cb49
 DIST github.com%2Fminio%2Fcli%2F@v%2Fv1.22.0.zip 73956 BLAKE2B 9f5737cf47f30317f309a2e44a9b017e4591d045964c60e8bf7ce04dcfc432a3949a220735903e3715e567cd1388c468173668cf65a265c87955c72122b3ee04 SHA512 e8936b5ebc08adb497cd19f4fcae42fc72f094614ad6813c974c8e0cd8352c45a64677aa472d2040838add9a7941ccd81e0e7eb60aa238e74c81af63496a33e5
-DIST github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.1.mod 106 BLAKE2B 3a12ffdec903574b295648b62030a2dfbf17b839bdc1471ceaa4253d0c24894380935a614d5c6c1900a97f90d7a8b5b39505b04dfed674f51660abb1b934eff9 SHA512 cd056e42363caeb2847c46abb748b6a1cf067f8ac01bec27dee80d97d8510ebf817fd938d2d1e406811fe3fc8dc01fb1c6d66b1dace808ee61ff62c399bfaa5d
-DIST github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.1.zip 30403 BLAKE2B 264460968a8811235744aff044ea64f29cbf6c069b044efe21a605eb7e793ed083857e84936780748651ba50eb6902ae58a21bccf6ba173b0a96f21a55e74197 SHA512 6bf3c8434406b690b35f44806bf9d5f7fa61c7d252bf6a407c0315942b6b1548df487375b628001a0a4dd0cebc53d03b244936593b104dbba94bebc0b41c02c2
 DIST github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.2.mod 106 BLAKE2B 3a12ffdec903574b295648b62030a2dfbf17b839bdc1471ceaa4253d0c24894380935a614d5c6c1900a97f90d7a8b5b39505b04dfed674f51660abb1b934eff9 SHA512 cd056e42363caeb2847c46abb748b6a1cf067f8ac01bec27dee80d97d8510ebf817fd938d2d1e406811fe3fc8dc01fb1c6d66b1dace808ee61ff62c399bfaa5d
 DIST github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.2.zip 30527 BLAKE2B da27d7e82e6c6cb7f1b246508f48bb7a1296039340382e3c538b5c4cf64d88c16675c83425e4cbd7a690b6b11c215cd93cbf6db80a9f2e8fc75859c966ebedf7 SHA512 fc16745b36272440c09331f23630bbb04fb780001cd2d70b01578b88af3d61c0cf9f5c9f9b6eeb157d31f390bd9669114b09cf2f5f67e11da57a337243397f52
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
@ -446,8 +444,8 @@ DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv1.1.0.zip 59286 BLAKE2B a6bc7bd4438fae0f
 DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
 DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.9.mod 343 BLAKE2B 05c4fa35af1c423699024f7681624a4c52682af9fb9e2804bba00d3b147da6d22c8bae1fe612abe30f16f6adc2c5b939c1cb0cb4837a71c2901b361d1df9e4a6 SHA512 902151ef22e3c2a56937b1a79de2b41e3fe589829e530f1ece8884a0bf3f63d1f71ed0c482b54e2a8c73bbcd6b2def1285a3a34d2569f833ca842b5fe01f51cd
 DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.9.zip 791554 BLAKE2B c1f5805f1c61d40eb87f88dea539c0794807457d1cdeeeb525ce28a6a4cf8fad91a6b21fbeb8456b695a81ad0fed16a816373d7d91ba1e5e4ecf5db0de07c590 SHA512 2a4bd9c883c7fe3f94d3f90dfc7a2d125c2931fe21c83226d39be5424e7810310d50a01843218bbf3da77e440f38fd64b5edb6c465c91ce44cf6ba56ca0754fe
-DIST github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.19.0.mod 597 BLAKE2B 0627b7070c7f20a5be921072e0fd72ae39631fb221f126bce31528dd643de4a59b0a96762c12b90faa1671a6a7c4a0f7bb45c86a3073bc564892a951668680f1 SHA512 46c631540df1b757a7df43378c6d55e8f1c0e5782bc24757f414cdff7c0475c6de93a40e6fb29126a79fc3731b59785dcded5bd267ece2b7221b3f4ced78b425
-DIST github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.19.0.zip 474200 BLAKE2B c9cbd4598998e92393a90a9dba4d3eab1503a05a979a8ccbb9e467bd046500866c9b8d1395eb219936cda5829ebcbdcd5459e616e32c02f493cbd85693120441 SHA512 1d366efb38914d7d5c8b0f9284f0a81211a29238f02abe99e6825040562fa47e352a442b47e431cf0d011a41e3b5cd1bde2dfb49b0b6d5f2a709314d4a6eda7e
+DIST github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.21.1.mod 597 BLAKE2B 3ca3d95f0d9412b962a1bf31d93163c240f2131659604b2359a88f91a59a5e843daea6a5ce005ea9b50ed9609faf5680221cf9469a5dd0a74a85a86b9bb09267 SHA512 0e6f9858fd00c112778f59b1ab755297e138e61e7a032cec8399596791b9c32a740f85d8c768f2390e09788548aa4f5b0d634fdeae62c2a68c199a52d8c362e0
+DIST github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.21.1.zip 483535 BLAKE2B 905e91117f87a94dc53543eaea499803135941bd4b6cf792231ef0e8eec4ab66c7e52cb4feb775436ff47b39eae8e6afea9318c89a780c8a7d255fcecf7dca88 SHA512 5ca4686fdfb9c6727d4f776ed4edaf06e23cd8ef4315273618824a0b40deefd29739450b4a6f62fa9af664bf0f329655b44b8b650880a7bb606b321f314d226a
 DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.10.0.mod 143 BLAKE2B 3e341758d7cb2a6bfd5794e57b488233e35638aa615a593ec1004275b46f64993d3ffca25606d62af954a60eabcc758db2edd73d7b69b8f05519f4e95aa2e0a0 SHA512 a84f987c3aeff7b18712d2f29582c443e9af6613c94847a6391d75abba5b37671ab52353297ff34fdfcc73b65e8f1ed835ff127191e5f5577e59cd2930e22066
 DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.10.0.zip 173393 BLAKE2B 8faca7e9c407ed979462249f24152c465e0947d1751c9b9e00d2fa8b9e6b0919be49b5dfe4fb943191fa25c1e706735adcce01aa65604f14d3ebc4b079f28195 SHA512 c03b53fb3358e1e0cbc505d0cd0beac510a59bb5cf0b4fb9fa8ce4050804c359e611e8fb4ae2c27ba5d670244264d44f283de862cc9db0438d4216872dff9adb
 DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
@ -458,8 +456,8 @@ DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.2.0.mod 96 BLAKE2B 08e3365708d7b0dcc
 DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.2.0.zip 27546 BLAKE2B bc74c4752b598ad6bcc13e84d697372ee6e9f5bcd18afdafa500f0128267965a6b1d9221c4ca33230ec92e2cda05d2ba4aefdf5322d39bfe2de74b7d025b1511 SHA512 b679f3cb44e6737015cae7dc567b13f7db62e4443cb588310b1dd7e4c16f300c602719d613499bd4d8159fa361afd1f74c23046b1f5d785b05ee5217a41ba478
 DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
 DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.zip 10281 BLAKE2B 78f309117cefd950c5e784bb64f6774f62797dd8419678f1d17d44c9f9b092eb7378f47f6bc4e1199043e261240f5b3493994e97a269fdfd1533c7438f6e00c1 SHA512 cc4067a1094494f168b72cc174ded31b29dfa044eac0c86c4993938561d63b7319cf2e47154c7c62afe96efbba6468bb495c0a00990d3ad2a075167e135469c5
-DIST github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.7.0.mod 157 BLAKE2B 68fa953355b2d44824771d260e5c03d46ff9977d1d6f953186e3378fa41a001870e4eee4a25e5440707c56cb5bf8b2b7e3451a30a4e99c027898679767ffea4c SHA512 edffc1d9f7f78060bde3eb66c7382f64452dcf116dd900d170a240a2a82548fec33a0d32794251d1f42d89672ea5ced1fd661753c8ee3c6b71410e38c9116b5c
-DIST github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.7.0.zip 66205 BLAKE2B a2644f4274402d4d0509c53761deb19b04b1fcee67e033c7e52fb91b573d22b7794eae9e1cea4c88ab590fd98c2660596215fa789dd35a65ea37f455ea00ef08 SHA512 c691d8c6591e17886ef1c305901396f206efde5a17b071e0f0031d328b6e3f34a09d32c015e21b55aa4e02715b6a1fbcbac2bdb51e7547426001b7354b571aca
+DIST github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.8.3.mod 157 BLAKE2B edfd63423add2f8bde517d206eec96a71e05b4925d387d840f1aa048f4218dc0ed885112f10dba1af9865060801c3023cc9159527e7cf33f171882cf01b2f391 SHA512 c4fd473af83abba9be069d849564cc57d6131e3f3b4f70403e5b7e4fd8dcc33f00d27357aad19a02916a96d3cd8c77002e10ce0a12dd9db8dd9f58bbe50bcb58
+DIST github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.8.3.zip 71411 BLAKE2B 199b957877352bca17a221e6be18f3d9951043e38673471b49dfb94c51a9abb9cd169dc5a092c5b0df85d5ba58593405d02413ceefa515b044cbbcb426bba7a9 SHA512 ed55fa3d4436abf34340c6e8110e03bc7d250aa9c63edc851427eb122946c605436d9c1bfd1a7e490bb78de3a238ece3f3dafb222da7a6e6f19fca1ba1dad529
 DIST github.com%2Fncw%2Fdirectio%2F@v%2Fv1.0.5.mod 40 BLAKE2B e526bf0fcbaa860ebb1790f3d31ced3b073c67462188344e1aeeb93a88023f5a87b25d2c37b4205284efb4946a98ba1f60bab8b14bd4d8dfbd67a3961e936a26 SHA512 899160c4750f36fdbf6e8dc2e2a375df08b0efa86ad8e12234e6d746ce30240cd29b2044856dc7f45835fe923093ccaa1245abe032c6ffbcb61955358f9c6ca0
 DIST github.com%2Fncw%2Fdirectio%2F@v%2Fv1.0.5.zip 6181 BLAKE2B d396ffaf09897d8a6207babf015674e9a216733cd03b8a6fa644944dd83d7aff2f9d8ceb355a17351322542865012ffe98e0ef41c8fc47de1fc9ad8140097a8c SHA512 dd29c381a25ccf1458997b93b8cab2f3110205c1c5103fa8c24beac9887e3afecb9c337a1d46e84aff499b8dfa1e128b30d5d803a40a8b392a175f198184af68
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
@ -533,7 +531,8 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip 261840 BLAKE2B 0b2120e55db33da70f3764bfd57657445f66fb4ba22c0d05898aa46156228c4a3e232cfaf24e2881707cffe7d3b5694fe04c03f589ee12d6329e94c90847e62e SHA512 cc3c69c18a6bd2bdc5e98de10c0ad6f9c540d5639252b007851be73c405e3774d1ca16518d3edeec036258300692b82a959bef3d92878c772370f6b8892ecc64
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.zip 58843 BLAKE2B c2b428482acde55ad00a09250883744c3ee201263827c3211605d954ead87f86803dc26728d4cb984006056a7762e06bb30e660554719cc5a9b0f05d8ef1aaea SHA512 5796e86dac74cfa807904227cd794717eb21010435bfd63993369455d5b865a69257a169f28c3d1245097302279117b6fac6152bc750b7efded420aff910b4b3
@ -590,8 +589,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
-DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.6.7.mod 121 BLAKE2B e72651d2cd058a4fc163d13369067b09f42e2ec713a1af0afe8858ce9fa517287d5618a2433391c43ee65b1cbce9fe86c342af4521ee8a2b693aee7bd596eee7 SHA512 91518015236bde181d69207bb74fc5126c51da3076090268409301d1672f36a344669870c4d85fcd54f86346e12c295aebea49af7916c86785d90fb5791c22f1
-DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.6.7.zip 54159 BLAKE2B 60f3026bdaef7ab2fc8677086f5f5a79f4ab41f7c968e0edd1f5a3c1d1c2c29f6f08d0fdd29c6ee8f91b664c05e07a25ef57a92a38abb5f8618e1ddb67ff1360 SHA512 cf3d32f5736592e21d029f37d9b7b2ec43d5a8ca42988e646ebdf282e6c8d12bde13e2ce13687c1d3aa9bd504b773a36007918c13c97f5e126d5b6bd4a64615c
 DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.6.8.mod 121 BLAKE2B e72651d2cd058a4fc163d13369067b09f42e2ec713a1af0afe8858ce9fa517287d5618a2433391c43ee65b1cbce9fe86c342af4521ee8a2b693aee7bd596eee7 SHA512 91518015236bde181d69207bb74fc5126c51da3076090268409301d1672f36a344669870c4d85fcd54f86346e12c295aebea49af7916c86785d90fb5791c22f1
 DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.6.8.zip 54207 BLAKE2B a6e63cb1c877adc74001aca4c7b5cbe7b7a64e6e4937faa48ced6b67486b7768bd9b4781aafeefb4646026d1b53dd13e33c68b1a905e06fec04f5783b362fa26 SHA512 d17fc907549186ca9dd65f9b79cb111cb21c15e1d92d395806cd557a156b70307f51188da2ae1b8a22aa6d5da0ea452d15d1ba6a4af05a886d307cd2d624db0d
 DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.3.mod 41 BLAKE2B eda6c6808269e3ad5a8a72ad7605ef0d4e34c7b650aaa07d486e16edbc690744f94989e0100f8f028691bb77e1ab091fa93cb6e164defab335d5c4a83725246c SHA512 b792dca982ab257a5fc83d90b51ca74afc0a2e5c86c54c45197a36ee77380ef6cb88fe4659b49300a3e49d2588199c5b094d66f8bf2a5e3d6104333286e5a143
@ -621,6 +618,7 @@ DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66b
 DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip 33696 BLAKE2B 698e18104a389eb6f9493ad19546a7b61e28b6e1ec138eba1b9f231a5bfca222057520861f3e5f466ec14a6908705b1cd5d0fa9339c5349d95f536e7162431a2 SHA512 b5cd794572b339f1b7ffea9443fdb5f2512b55f2d2ccbb39ddd4d4163eb3396576cb85d99c72b16d4ff564bf2a5062ea54c6d313126cf1c3e4d81a0663643d3b
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
@ -661,10 +659,9 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.zip 1861834 BLAKE2B 424b2766033856c982c904a12b58bb06299342a755aec2bc1dde2d82a5ece26d845836f4917172b349962ebe485ff0692a0476d4671c5f645b9a4bd7822e23b2 SHA512 cde0ef96a8b75180cbe07c8c1853eb00777f0b44d548ee0947d22251fc8f9d1217b35c8c1ab6cf41805b808c9e75e83501ae935b16bdc85fcab4460afe0e1a84
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip 1864871 BLAKE2B c621f8aecb2a2732dab3954a1c74d8d657ce336ae195a1c81f2e4521069a8afa0e60e1e204460b922474dc17ea02ea5f5a7cc08902bb2da49ee7a4cb0e4e9d48 SHA512 3a80bda483d8e3b8297b09d97c2a199b132d4f932485fd30020ee3c9fe9ad08c1d2793a3cdd749f3d2731815713bdfa40c6a50234ff991392db7475d2c45abe2
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
@ -674,6 +671,7 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAK
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@ -696,6 +694,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
@ -713,7 +712,8 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip 28627 BLAKE2B 616de462c5c7d1ad7d5b792caf2e3c9d45c5095d723dace2038e012672055b6c052a043414db7b87b26f43c1688d8c353fc63b666ebd9569f832fc08f7ac99ca SHA512 eda82aa21a23db9ccdf960f6fb0583223839623643525410764e5684d8551e725c3bf76fcf68a4b4ef1d1fb48505d248b9600c736e0e9497d9efd4bfe5bd059e
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip 28673 BLAKE2B d5a34f311e12038daf9c89b646bc5caf5566c08fc563fe2af3d113596d77cfe759942e35314e5b595c5704920d12b273ac30de865256b406287868d827d28938 SHA512 443917030bd593bf9ba4fee7748b5d9f15c82b7cbb21a586fc9a326de9c4f8fd8a7caf29131b0c8cf9fbf6a1363fdc7c8dd2ab897b569d3adaacfb55ad0d4601
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@ -750,10 +750,11 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201015000850-e3ed0017c211.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.zip 1546031 BLAKE2B b8b07e0d05b0bd1b77ef90145d6684a30225e5c38ebc21039e94524792937ef49d60ef2705fe226f62a03712553c685c5eff6c4ddaa6a1fad0327151769125b2 SHA512 f4a3d3f6af5020f70eb69f539c4ee8452028aad40bda05bcd5de74e725db1ffc487a3ff2bf31e4c26ef530b74fa090332f608bec5a2ee233ddfd82c1209e77b4
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.zip 1629496 BLAKE2B caed964dd6b55ef705e87721c9c5988e2c70fdfb91a17185ad36e3f30733a0fcc3bbf5becfd99c54e083be9744e34eddaa9559ee238d79909352721e291f9d6a SHA512 d3a72c106c82dd71dfe24112e74dde867c6649bea85f643f89d17853e6f0095ca15be9e0c41e8f83ff6de2df9d0037fb92246e48a0874969a9075d231a9286fe
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@ -770,7 +771,6 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 B
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
@ -784,7 +784,9 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201105001634-bc3cf281b174.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip 3276723 BLAKE2B 12b3291e8ce52a94677d56ad3cbf020f56777301c8b308b1f05189d346caa6395e8a0e177efa226e15e6e9235c1e387031d34cf61b08b4fc0f3769d65120ded1 SHA512 e1beb4466d35acaf836e0a8f015177e44c346f4fa31599a0b022cb19cf7b6623a3d3efcaf9c00114cd6f86a7634f19c14208a8a48ca3adee780da67964a60b57
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
@ -873,14 +875,10 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
-DIST minio-2021.03.17.02.33.02.tar.gz 10578377 BLAKE2B 78bf506d9e6bda7f88ce9fa1db488b4625baaa7edf3194f0399a8e03a29af2cde35322db907c18d6ea2c04c0a93113be1c45e5ac1bbc633301e6c3d20cdf118e SHA512 042ba4924b61f2ccfaf5bc132883da6b620e1a0b02fb69fe6ae9a1d47986f8ab63babf634386d27566fe54149219f3e92e62557ea90f630f9f4e98980e98d0e5
-DIST minio-2021.03.26.00.00.41.tar.gz 10587318 BLAKE2B 2b72049b6ca7980cddfd26319eda7392896afa94adeb3bb85920b44b62b7688a2ce3d0fd9d8df3695807beda9e4ea223663561b36ca2557b1316b284ae6bb06a SHA512 32b5769116109a0679f6535c05711c36e9ac591505eb3577973ba1073175b8661d08a176b3eceb1cf21dd674b68599954ebb39609fb49f9f53605a79145eb96c
-DIST minio-2021.04.06.23.11.00.tar.gz 10588050 BLAKE2B abbc957117c150011d10c0273381715ee8f621f44d12394085f7e034d83639931a9f8e537c4ad286ec38d460bc158effe921e8f75082ec0d007980a37ad9ed83 SHA512 5c0ea69c4a2435a29c9caa1e6faafdece75b491cbb47aa8a5ffdde24dd689a228cb0265d83aea89816010758f895584f2e42bc4574b69451fa9cb382630258e8
+DIST minio-2021.04.18.19.26.29.tar.gz 10628301 BLAKE2B c641607b8610104699910c4ee549b0e355c7e116b9b2c6debcf4b69b2d00dd41a8d1b5dbf8319c9dbccf56bfa51dcea900958f80e4506b82851db1c5810586b3 SHA512 954b060bc499d34d09ce395d5ef96858280eed89c1f63ce4a1635b259289451ea7c3849f8fc62169a935b7a81037f42995ceb46927ba4e531486f947f603092d
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
-EBUILD minio-2021.03.17.02.33.02.ebuild 46098 BLAKE2B 1e0d4c40f01c5d265ad544a53aaaf790c72d7507c1e8a89dec345678f13a2e57a49bbb6b30da55beabe096efb9d2ec241d150c457eb5d779448aa81b3d90b2c2 SHA512 fff3abf05dbb8942c24e43211c43ddb04dfdb32ed5d89c7160edd5b318a50e2b2ec318e609596e948fa99d18807a2de730e249864be0c142b1cc074a2f8e7107
-EBUILD minio-2021.03.26.00.00.41.ebuild 46008 BLAKE2B a4c58b84d3c1b129ca5d83adedb0abffca5ad21cdbea9be2ef61188c1ef6641c4084ce644077342c5f5607ed326de3d9f98350fb67818aaa658c41f1329b9afe SHA512 67cbe5baa037d99f744d5c4575fd9671fad39577e739831a90f61efd01ee9a77c13fc3a35a491ddc784311f3c0d86d3bf56f540f3f59de12720f7d08f4c626cc
-EBUILD minio-2021.04.06.23.11.00.ebuild 46008 BLAKE2B a4c58b84d3c1b129ca5d83adedb0abffca5ad21cdbea9be2ef61188c1ef6641c4084ce644077342c5f5607ed326de3d9f98350fb67818aaa658c41f1329b9afe SHA512 67cbe5baa037d99f744d5c4575fd9671fad39577e739831a90f61efd01ee9a77c13fc3a35a491ddc784311f3c0d86d3bf56f540f3f59de12720f7d08f4c626cc
+EBUILD minio-2021.04.18.19.26.29-r1.ebuild 46496 BLAKE2B 036f71205f9d6de581639dda7a503ee45f9cfa84896689ea3ca9e410bb55536cf6a4762f92b9711ad3c8a86b7eed076fd992aeb51e83498596d5c06578d06414 SHA512 e0f1573aaf5097d2fbbefd8323dad9f530bc386d7d0b8d14d5d19f6ecbe61a7aea362068f29f289524c95aff0f7792fd37839e6ad45fdcdd0c5d2d0c796fa755
 MISC metadata.xml 243 BLAKE2B 0c14bd67f89d1810c3ae234b84edbe802e4f0905c0e3e45401dbbe3fe1ab7dab6b59c70e25c66e84386f71600bbd0e32f02539fbdd0f80f76ea73aaf5caba7ec SHA512 18b9fbd65651eb42d5b577c6007eab66ba831ee0196ffde7fc7f6987d13b2fe184c09d5cf97866288458a224e7fe98544029653d76732eb2148fa8bafb66ddcd
--- a/net-fs/minio/minio-2021.03.17.02.33.02.ebuild
+++ b/net-fs/minio/minio-2021.03.17.02.33.02.ebuild
@ -1,937 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT=feafccf0072a9b5fbddc33553890ff56cb2f83b6
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-
-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.39.0"
-	"cloud.google.com/go v0.39.0/go.mod"
-	"git.apache.org/thrift.git v0.13.0"
-	"git.apache.org/thrift.git v0.13.0/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.2"
-	"github.com/Azure/azure-pipeline-go v0.2.2/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.10.0"
-	"github.com/Azure/azure-storage-blob-go v0.10.0/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.1"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.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/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.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/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
-	"github.com/Shopify/sarama v1.19.0/go.mod"
-	"github.com/Shopify/sarama v1.27.2"
-	"github.com/Shopify/sarama v1.27.2/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
-	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
-	"github.com/alecthomas/participle v0.2.1"
-	"github.com/alecthomas/participle v0.2.1/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/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-	"github.com/apache/thrift v0.12.0/go.mod"
-	"github.com/apache/thrift v0.13.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
-	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
-	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.35.20/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
-	"github.com/bcicen/jstream v1.0.1"
-	"github.com/bcicen/jstream v1.0.1/go.mod"
-	"github.com/beevik/ntp v0.3.0"
-	"github.com/beevik/ntp v0.3.0/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/go.mod"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.29"
-	"github.com/cheggaaa/pb v1.0.29/go.mod"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-	"github.com/colinmarc/hdfs/v2 v2.2.0"
-	"github.com/colinmarc/hdfs/v2 v2.2.0/go.mod"
-	"github.com/coredns/coredns v1.4.0"
-	"github.com/coredns/coredns v1.4.0/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/creack/pty v1.1.7/go.mod"
-	"github.com/creack/pty v1.1.9/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/dchest/siphash v1.2.1"
-	"github.com/dchest/siphash v1.2.1/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/djherbis/atime v1.0.0"
-	"github.com/djherbis/atime v1.0.0/go.mod"
-	"github.com/dswarbrick/smart v0.0.0-20190505152634-909a45200d6d"
-	"github.com/dswarbrick/smart v0.0.0-20190505152634-909a45200d6d/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
-	"github.com/eapache/go-resiliency v1.2.0"
-	"github.com/eapache/go-resiliency v1.2.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/eclipse/paho.mqtt.golang v1.3.0"
-	"github.com/eclipse/paho.mqtt.golang v1.3.0/go.mod"
-	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fatih/color v1.10.0"
-	"github.com/fatih/color v1.10.0/go.mod"
-	"github.com/fatih/structs v1.1.0"
-	"github.com/fatih/structs v1.1.0/go.mod"
-	"github.com/felixge/httpsnoop v1.0.1"
-	"github.com/felixge/httpsnoop v1.0.1/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-	"github.com/frankban/quicktest v1.10.2"
-	"github.com/frankban/quicktest v1.10.2/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-asn1-ber/asn1-ber v1.5.1"
-	"github.com/go-asn1-ber/asn1-ber v1.5.1/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-kit/kit v0.10.0/go.mod"
-	"github.com/go-ldap/ldap v3.0.2+incompatible"
-	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-	"github.com/go-ldap/ldap/v3 v3.2.4"
-	"github.com/go-ldap/ldap/v3 v3.2.4/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-logfmt/logfmt v0.5.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-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0"
-	"github.com/go-sql-driver/mysql v1.5.0/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/gogo/googleapis v1.1.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/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-20190702054246-869f871628b6"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.1.0/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.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/golang/protobuf v1.4.3"
-	"github.com/golang/protobuf v1.4.3/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/gomodule/redigo v1.8.3"
-	"github.com/gomodule/redigo v1.8.3/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/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/google/uuid v1.1.2"
-	"github.com/google/uuid v1.1.2/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/context v1.1.1/go.mod"
-	"github.com/gorilla/handlers v1.5.1"
-	"github.com/gorilla/handlers v1.5.1/go.mod"
-	"github.com/gorilla/mux v1.6.2/go.mod"
-	"github.com/gorilla/mux v1.7.3/go.mod"
-	"github.com/gorilla/mux v1.8.0"
-	"github.com/gorilla/mux v1.8.0/go.mod"
-	"github.com/gorilla/securecookie v1.1.1"
-	"github.com/gorilla/securecookie v1.1.1/go.mod"
-	"github.com/gorilla/sessions v1.2.0/go.mod"
-	"github.com/gorilla/sessions v1.2.1"
-	"github.com/gorilla/sessions v1.2.1/go.mod"
-	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-	"github.com/gorilla/websocket v1.4.2"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-	"github.com/hashicorp/consul/api v1.3.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.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-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.1/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"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-	"github.com/hashicorp/go-msgpack v1.1.5"
-	"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.4"
-	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
-	"github.com/hashicorp/go-rootcerts v1.0.1/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/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.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/raft v1.2.0"
-	"github.com/hashicorp/raft v1.2.0/go.mod"
-	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hashicorp/vault/api v1.0.4"
-	"github.com/hashicorp/vault/api v1.0.4/go.mod"
-	"github.com/hashicorp/vault/sdk v0.1.13"
-	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/hudl/fargo v1.3.0/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-	"github.com/jcmturner/aescts/v2 v2.0.0"
-	"github.com/jcmturner/aescts/v2 v2.0.0/go.mod"
-	"github.com/jcmturner/dnsutils/v2 v2.0.0"
-	"github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod"
-	"github.com/jcmturner/gofork v1.0.0"
-	"github.com/jcmturner/gofork v1.0.0/go.mod"
-	"github.com/jcmturner/goidentity/v6 v6.0.1"
-	"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
-	"github.com/jcmturner/gokrb5/v8 v8.4.1/go.mod"
-	"github.com/jcmturner/gokrb5/v8 v8.4.2"
-	"github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod"
-	"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
-	"github.com/jcmturner/rpc/v2 v2.0.3"
-	"github.com/jcmturner/rpc/v2 v2.0.3/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/josharian/intern v1.0.0"
-	"github.com/josharian/intern v1.0.0/go.mod"
-	"github.com/jpillora/backoff v1.0.0/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.8/go.mod"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/json-iterator/go v1.1.10"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.11.0/go.mod"
-	"github.com/klauspost/compress v1.11.7"
-	"github.com/klauspost/compress v1.11.7/go.mod"
-	"github.com/klauspost/compress v1.11.12"
-	"github.com/klauspost/compress v1.11.12/go.mod"
-	"github.com/klauspost/cpuid v1.2.3/go.mod"
-	"github.com/klauspost/cpuid v1.3.1"
-	"github.com/klauspost/cpuid v1.3.1/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.2/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.3/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.4"
-	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
-	"github.com/klauspost/pgzip v1.2.5"
-	"github.com/klauspost/pgzip v1.2.5/go.mod"
-	"github.com/klauspost/readahead v1.3.1"
-	"github.com/klauspost/readahead v1.3.1/go.mod"
-	"github.com/klauspost/reedsolomon v1.9.11"
-	"github.com/klauspost/reedsolomon v1.9.11/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/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.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/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/lib/pq v1.8.0"
-	"github.com/lib/pq v1.8.0/go.mod"
-	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
-	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
-	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
-	"github.com/magefile/mage v1.10.0"
-	"github.com/magefile/mage v1.10.0/go.mod"
-	"github.com/mailru/easyjson v0.7.6"
-	"github.com/mailru/easyjson v0.7.6/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.8"
-	"github.com/mattn/go-colorable v0.1.8/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.1"
-	"github.com/mattn/go-ieproxy v0.0.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/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.2/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/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.35"
-	"github.com/miekg/dns v1.1.35/go.mod"
-	"github.com/minio/cli v1.22.0"
-	"github.com/minio/cli v1.22.0/go.mod"
-	"github.com/minio/highwayhash v1.0.1"
-	"github.com/minio/highwayhash v1.0.1/go.mod"
-	"github.com/minio/md5-simd v1.1.0/go.mod"
-	"github.com/minio/md5-simd v1.1.1"
-	"github.com/minio/md5-simd v1.1.1/go.mod"
-	"github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78"
-	"github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78/go.mod"
-	"github.com/minio/selfupdate v0.3.1"
-	"github.com/minio/selfupdate v0.3.1/go.mod"
-	"github.com/minio/sha256-simd v0.1.1/go.mod"
-	"github.com/minio/sha256-simd v1.0.0"
-	"github.com/minio/sha256-simd v1.0.0/go.mod"
-	"github.com/minio/simdjson-go v0.2.1"
-	"github.com/minio/simdjson-go v0.2.1/go.mod"
-	"github.com/minio/sio v0.2.1"
-	"github.com/minio/sio v0.2.1/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir 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-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mmcloughlin/avo v0.0.0-20201105074841-5d2f697d268f/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-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/montanaflynn/stats v0.5.0"
-	"github.com/montanaflynn/stats v0.5.0/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-	"github.com/nats-io/jwt v0.3.0/go.mod"
-	"github.com/nats-io/jwt v0.3.2/go.mod"
-	"github.com/nats-io/jwt v1.1.0"
-	"github.com/nats-io/jwt v1.1.0/go.mod"
-	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
-	"github.com/nats-io/nats-server/v2 v2.1.9"
-	"github.com/nats-io/nats-server/v2 v2.1.9/go.mod"
-	"github.com/nats-io/nats-streaming-server v0.19.0"
-	"github.com/nats-io/nats-streaming-server v0.19.0/go.mod"
-	"github.com/nats-io/nats.go v1.9.1/go.mod"
-	"github.com/nats-io/nats.go v1.10.0"
-	"github.com/nats-io/nats.go v1.10.0/go.mod"
-	"github.com/nats-io/nkeys v0.1.0/go.mod"
-	"github.com/nats-io/nkeys v0.1.3/go.mod"
-	"github.com/nats-io/nkeys v0.1.4/go.mod"
-	"github.com/nats-io/nkeys v0.2.0"
-	"github.com/nats-io/nkeys v0.2.0/go.mod"
-	"github.com/nats-io/nuid v1.0.1"
-	"github.com/nats-io/nuid v1.0.1/go.mod"
-	"github.com/nats-io/stan.go v0.7.0"
-	"github.com/nats-io/stan.go v0.7.0/go.mod"
-	"github.com/ncw/directio v1.0.5"
-	"github.com/ncw/directio v1.0.5/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/nsqio/go-nsq v1.0.8"
-	"github.com/nsqio/go-nsq v1.0.8/go.mod"
-	"github.com/oklog/oklog v0.3.2/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-	"github.com/olivere/elastic/v7 v7.0.22"
-	"github.com/olivere/elastic/v7 v7.0.22/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.2.0/go.mod"
-	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod"
-	"github.com/pborman/uuid v1.2.0/go.mod"
-	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-	"github.com/philhofer/fwd v1.1.1"
-	"github.com/philhofer/fwd v1.1.1/go.mod"
-	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/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/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pkg/profile v1.2.1/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/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-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.3.0/go.mod"
-	"github.com/prometheus/client_golang v1.7.1/go.mod"
-	"github.com/prometheus/client_golang v1.8.0"
-	"github.com/prometheus/client_golang v1.8.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.1.0/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-20181126121408-4724e9255275/go.mod"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/common v0.10.0/go.mod"
-	"github.com/prometheus/common v0.14.0"
-	"github.com/prometheus/common v0.14.0/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-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/prometheus/procfs v0.1.3/go.mod"
-	"github.com/prometheus/procfs v0.2.0"
-	"github.com/prometheus/procfs v0.2.0/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0"
-	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod"
-	"github.com/rjeczalik/notify v0.9.2"
-	"github.com/rjeczalik/notify v0.9.2/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/rs/cors v1.7.0"
-	"github.com/rs/cors v1.7.0/go.mod"
-	"github.com/rs/xid v1.2.1"
-	"github.com/rs/xid v1.2.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/secure-io/sio-go v0.3.1"
-	"github.com/secure-io/sio-go v0.3.1/go.mod"
-	"github.com/shirou/gopsutil/v3 v3.21.1"
-	"github.com/shirou/gopsutil/v3 v3.21.1/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/sirupsen/logrus v1.6.0/go.mod"
-	"github.com/sirupsen/logrus v1.8.0"
-	"github.com/sirupsen/logrus v1.8.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/assertions v1.1.1"
-	"github.com/smartystreets/assertions v1.1.1/go.mod"
-	"github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/smartystreets/gunit v1.4.2/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/sony/gobreaker v0.4.1/go.mod"
-	"github.com/spaolacci/murmur3 v1.1.0"
-	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.1"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
-	"github.com/streadway/amqp v1.0.0"
-	"github.com/streadway/amqp v1.0.0/go.mod"
-	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/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.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/tidwall/gjson v1.6.7"
-	"github.com/tidwall/gjson v1.6.7/go.mod"
-	"github.com/tidwall/match v1.0.3"
-	"github.com/tidwall/match v1.0.3/go.mod"
-	"github.com/tidwall/pretty v1.0.2"
-	"github.com/tidwall/pretty v1.0.2/go.mod"
-	"github.com/tidwall/sjson v1.0.4"
-	"github.com/tidwall/sjson v1.0.4/go.mod"
-	"github.com/tinylib/msgp v1.1.3"
-	"github.com/tinylib/msgp v1.1.3/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-	"github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31"
-	"github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/urfave/cli v1.22.1/go.mod"
-	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a"
-	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
-	"github.com/willf/bitset v1.1.11"
-	"github.com/willf/bitset v1.1.11/go.mod"
-	"github.com/willf/bloom v2.0.3+incompatible"
-	"github.com/willf/bloom v2.0.3+incompatible/go.mod"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-	"github.com/xdg/stringprep v1.0.0"
-	"github.com/xdg/stringprep v1.0.0/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.2.1/go.mod"
-	"go.etcd.io/bbolt v1.3.3/go.mod"
-	"go.etcd.io/bbolt v1.3.5"
-	"go.etcd.io/bbolt v1.3.5/go.mod"
-	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-	"go.etcd.io/etcd v0.0.0-20201125193152-8a03d2e9614b"
-	"go.etcd.io/etcd v0.0.0-20201125193152-8a03d2e9614b/go.mod"
-	"go.opencensus.io v0.20.1/go.mod"
-	"go.opencensus.io v0.20.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.opencensus.io v0.22.5"
-	"go.opencensus.io v0.22.5/go.mod"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/atomic v1.5.0"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/multierr v1.3.0"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"go.uber.org/zap v1.13.0"
-	"go.uber.org/zap v1.13.0/go.mod"
-	"golang.org/x/arch v0.0.0-20201008161808-52c3e6f60cff/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-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/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-20200117160349-530e935923ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod"
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
-	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
-	"golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392"
-	"golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/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-20190930215403-16217165b5de"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-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-20190125091013-d26f9f9a57f3/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-20190603091049-60506f45cf65/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-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
-	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod"
-	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/net v0.0.0-20201216054612-986b41b23924"
-	"golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/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"
-	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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-20180926160741-c2ed4eda69e7/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-20181122145206-62eef0e2fa9b/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190130150945-aca44879d564/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-20190523142557-0e01d883c5c5/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/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-20191112214154-59a1497f0cea/go.mod"
-	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod"
-	"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
-	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/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.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/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-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
-	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
-	"golang.org/x/tools v0.0.0-20201105001634-bc3cf281b174/go.mod"
-	"golang.org/x/tools v0.1.0"
-	"golang.org/x/tools v0.1.0/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.3.1/go.mod"
-	"google.golang.org/api v0.5.0"
-	"google.golang.org/api v0.5.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.4.0"
-	"google.golang.org/appengine v1.4.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-20190404172233-64821d5d2107/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/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.17.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.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.22.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.23.1/go.mod"
-	"google.golang.org/grpc v1.26.0"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-	"gopkg.in/ini.v1 v1.57.0"
-	"gopkg.in/ini.v1 v1.57.0/go.mod"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/urfave/cli.v1 v1.20.0/go.mod"
-	"gopkg.in/warnings.v0 v0.1.2/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/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"rsc.io/pdf v0.1.1/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-	)
-
-go-module_set_globals
-
-SRC_URI="https://github.com/minio/minio/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-
-RESTRICT="test"
-
-BDEPEND="
-	acct-user/minio
-	acct-group/minio
-"
-
-S="${WORKDIR}/${PN}-RELEASE.${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/" \
-		-e "s/-s //" \
-		-e "/time/d" \
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/" \
-		buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	go build \
-		--ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-}
-
-src_install() {
-	dobin minio
-
-	insinto /etc/defult
-	doins "${FILESDIR}"/minio.default
-
-	dodoc -r README.md CONTRIBUTING.md docs
-
-	systemd_dounit "${FILESDIR}"/minio.service
-	newinitd "${FILESDIR}"/minio.initd minio
-
-	keepdir /var/{lib,log}/minio
-	fowners minio:minio /var/{lib,log}/minio
-}
--- a/net-fs/minio/minio-2021.04.06.23.11.00.ebuild
+++ b/net-fs/minio/minio-2021.04.06.23.11.00.ebuild
@ -1,936 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT=feafccf0072a9b5fbddc33553890ff56cb2f83b6
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-
-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.39.0"
-	"cloud.google.com/go v0.39.0/go.mod"
-	"git.apache.org/thrift.git v0.13.0"
-	"git.apache.org/thrift.git v0.13.0/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.2"
-	"github.com/Azure/azure-pipeline-go v0.2.2/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.10.0"
-	"github.com/Azure/azure-storage-blob-go v0.10.0/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.1"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.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/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.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/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
-	"github.com/Shopify/sarama v1.19.0/go.mod"
-	"github.com/Shopify/sarama v1.27.2"
-	"github.com/Shopify/sarama v1.27.2/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-	"github.com/VividCortex/ewma v1.1.1"
-	"github.com/VividCortex/ewma v1.1.1/go.mod"
-	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
-	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
-	"github.com/alecthomas/participle v0.2.1"
-	"github.com/alecthomas/participle v0.2.1/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/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-	"github.com/apache/thrift v0.12.0/go.mod"
-	"github.com/apache/thrift v0.13.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
-	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
-	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.35.20/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
-	"github.com/bcicen/jstream v1.0.1"
-	"github.com/bcicen/jstream v1.0.1/go.mod"
-	"github.com/beevik/ntp v0.3.0"
-	"github.com/beevik/ntp v0.3.0/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/go.mod"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.29"
-	"github.com/cheggaaa/pb v1.0.29/go.mod"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-	"github.com/colinmarc/hdfs/v2 v2.2.0"
-	"github.com/colinmarc/hdfs/v2 v2.2.0/go.mod"
-	"github.com/coredns/coredns v1.4.0"
-	"github.com/coredns/coredns v1.4.0/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/creack/pty v1.1.7/go.mod"
-	"github.com/creack/pty v1.1.9/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/dchest/siphash v1.2.1"
-	"github.com/dchest/siphash v1.2.1/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/djherbis/atime v1.0.0"
-	"github.com/djherbis/atime v1.0.0/go.mod"
-	"github.com/dswarbrick/smart v0.0.0-20190505152634-909a45200d6d"
-	"github.com/dswarbrick/smart v0.0.0-20190505152634-909a45200d6d/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
-	"github.com/eapache/go-resiliency v1.2.0"
-	"github.com/eapache/go-resiliency v1.2.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/eclipse/paho.mqtt.golang v1.3.0"
-	"github.com/eclipse/paho.mqtt.golang v1.3.0/go.mod"
-	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fatih/color v1.10.0"
-	"github.com/fatih/color v1.10.0/go.mod"
-	"github.com/fatih/structs v1.1.0"
-	"github.com/fatih/structs v1.1.0/go.mod"
-	"github.com/felixge/httpsnoop v1.0.1"
-	"github.com/felixge/httpsnoop v1.0.1/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-	"github.com/frankban/quicktest v1.10.2"
-	"github.com/frankban/quicktest v1.10.2/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-asn1-ber/asn1-ber v1.5.1"
-	"github.com/go-asn1-ber/asn1-ber v1.5.1/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-kit/kit v0.10.0/go.mod"
-	"github.com/go-ldap/ldap v3.0.2+incompatible"
-	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-	"github.com/go-ldap/ldap/v3 v3.2.4"
-	"github.com/go-ldap/ldap/v3 v3.2.4/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-logfmt/logfmt v0.5.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-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0"
-	"github.com/go-sql-driver/mysql v1.5.0/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/gogo/googleapis v1.1.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/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-20190702054246-869f871628b6"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.1.0/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.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/golang/protobuf v1.4.3"
-	"github.com/golang/protobuf v1.4.3/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/gomodule/redigo v1.8.3"
-	"github.com/gomodule/redigo v1.8.3/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/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/google/uuid v1.1.2"
-	"github.com/google/uuid v1.1.2/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/context v1.1.1/go.mod"
-	"github.com/gorilla/handlers v1.5.1"
-	"github.com/gorilla/handlers v1.5.1/go.mod"
-	"github.com/gorilla/mux v1.6.2/go.mod"
-	"github.com/gorilla/mux v1.7.3/go.mod"
-	"github.com/gorilla/mux v1.8.0"
-	"github.com/gorilla/mux v1.8.0/go.mod"
-	"github.com/gorilla/securecookie v1.1.1"
-	"github.com/gorilla/securecookie v1.1.1/go.mod"
-	"github.com/gorilla/sessions v1.2.0/go.mod"
-	"github.com/gorilla/sessions v1.2.1"
-	"github.com/gorilla/sessions v1.2.1/go.mod"
-	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-	"github.com/gorilla/websocket v1.4.2"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-	"github.com/hashicorp/consul/api v1.3.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.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-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.1/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"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-	"github.com/hashicorp/go-msgpack v1.1.5"
-	"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.4"
-	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
-	"github.com/hashicorp/go-rootcerts v1.0.1/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/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.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/raft v1.2.0"
-	"github.com/hashicorp/raft v1.2.0/go.mod"
-	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hashicorp/vault/api v1.0.4"
-	"github.com/hashicorp/vault/api v1.0.4/go.mod"
-	"github.com/hashicorp/vault/sdk v0.1.13"
-	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/hudl/fargo v1.3.0/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-	"github.com/jcmturner/aescts/v2 v2.0.0"
-	"github.com/jcmturner/aescts/v2 v2.0.0/go.mod"
-	"github.com/jcmturner/dnsutils/v2 v2.0.0"
-	"github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod"
-	"github.com/jcmturner/gofork v1.0.0"
-	"github.com/jcmturner/gofork v1.0.0/go.mod"
-	"github.com/jcmturner/goidentity/v6 v6.0.1"
-	"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
-	"github.com/jcmturner/gokrb5/v8 v8.4.1/go.mod"
-	"github.com/jcmturner/gokrb5/v8 v8.4.2"
-	"github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod"
-	"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
-	"github.com/jcmturner/rpc/v2 v2.0.3"
-	"github.com/jcmturner/rpc/v2 v2.0.3/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/josharian/intern v1.0.0"
-	"github.com/josharian/intern v1.0.0/go.mod"
-	"github.com/jpillora/backoff v1.0.0/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.8/go.mod"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/json-iterator/go v1.1.10"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.11.0/go.mod"
-	"github.com/klauspost/compress v1.11.7/go.mod"
-	"github.com/klauspost/compress v1.11.12"
-	"github.com/klauspost/compress v1.11.12/go.mod"
-	"github.com/klauspost/cpuid v1.2.3/go.mod"
-	"github.com/klauspost/cpuid v1.3.1"
-	"github.com/klauspost/cpuid v1.3.1/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.2/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.3/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.4"
-	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
-	"github.com/klauspost/pgzip v1.2.5"
-	"github.com/klauspost/pgzip v1.2.5/go.mod"
-	"github.com/klauspost/readahead v1.3.1"
-	"github.com/klauspost/readahead v1.3.1/go.mod"
-	"github.com/klauspost/reedsolomon v1.9.11"
-	"github.com/klauspost/reedsolomon v1.9.11/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/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.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/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/lib/pq v1.8.0"
-	"github.com/lib/pq v1.8.0/go.mod"
-	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
-	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
-	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
-	"github.com/magefile/mage v1.10.0"
-	"github.com/magefile/mage v1.10.0/go.mod"
-	"github.com/mailru/easyjson v0.7.6"
-	"github.com/mailru/easyjson v0.7.6/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.8"
-	"github.com/mattn/go-colorable v0.1.8/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.1"
-	"github.com/mattn/go-ieproxy v0.0.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/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.2/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/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.35"
-	"github.com/miekg/dns v1.1.35/go.mod"
-	"github.com/minio/cli v1.22.0"
-	"github.com/minio/cli v1.22.0/go.mod"
-	"github.com/minio/highwayhash v1.0.2"
-	"github.com/minio/highwayhash v1.0.2/go.mod"
-	"github.com/minio/md5-simd v1.1.0/go.mod"
-	"github.com/minio/md5-simd v1.1.1"
-	"github.com/minio/md5-simd v1.1.1/go.mod"
-	"github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78"
-	"github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78/go.mod"
-	"github.com/minio/selfupdate v0.3.1"
-	"github.com/minio/selfupdate v0.3.1/go.mod"
-	"github.com/minio/sha256-simd v0.1.1/go.mod"
-	"github.com/minio/sha256-simd v1.0.0"
-	"github.com/minio/sha256-simd v1.0.0/go.mod"
-	"github.com/minio/simdjson-go v0.2.1"
-	"github.com/minio/simdjson-go v0.2.1/go.mod"
-	"github.com/minio/sio v0.2.1"
-	"github.com/minio/sio v0.2.1/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir 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-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mmcloughlin/avo v0.0.0-20201105074841-5d2f697d268f/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-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/montanaflynn/stats v0.5.0"
-	"github.com/montanaflynn/stats v0.5.0/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-	"github.com/nats-io/jwt v0.3.0/go.mod"
-	"github.com/nats-io/jwt v0.3.2/go.mod"
-	"github.com/nats-io/jwt v1.1.0"
-	"github.com/nats-io/jwt v1.1.0/go.mod"
-	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
-	"github.com/nats-io/nats-server/v2 v2.1.9"
-	"github.com/nats-io/nats-server/v2 v2.1.9/go.mod"
-	"github.com/nats-io/nats-streaming-server v0.19.0"
-	"github.com/nats-io/nats-streaming-server v0.19.0/go.mod"
-	"github.com/nats-io/nats.go v1.9.1/go.mod"
-	"github.com/nats-io/nats.go v1.10.0"
-	"github.com/nats-io/nats.go v1.10.0/go.mod"
-	"github.com/nats-io/nkeys v0.1.0/go.mod"
-	"github.com/nats-io/nkeys v0.1.3/go.mod"
-	"github.com/nats-io/nkeys v0.1.4/go.mod"
-	"github.com/nats-io/nkeys v0.2.0"
-	"github.com/nats-io/nkeys v0.2.0/go.mod"
-	"github.com/nats-io/nuid v1.0.1"
-	"github.com/nats-io/nuid v1.0.1/go.mod"
-	"github.com/nats-io/stan.go v0.7.0"
-	"github.com/nats-io/stan.go v0.7.0/go.mod"
-	"github.com/ncw/directio v1.0.5"
-	"github.com/ncw/directio v1.0.5/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/nsqio/go-nsq v1.0.8"
-	"github.com/nsqio/go-nsq v1.0.8/go.mod"
-	"github.com/oklog/oklog v0.3.2/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-	"github.com/olivere/elastic/v7 v7.0.22"
-	"github.com/olivere/elastic/v7 v7.0.22/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.2.0/go.mod"
-	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod"
-	"github.com/pborman/uuid v1.2.0/go.mod"
-	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-	"github.com/philhofer/fwd v1.1.1"
-	"github.com/philhofer/fwd v1.1.1/go.mod"
-	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/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/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pkg/profile v1.2.1/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/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-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.3.0/go.mod"
-	"github.com/prometheus/client_golang v1.7.1/go.mod"
-	"github.com/prometheus/client_golang v1.8.0"
-	"github.com/prometheus/client_golang v1.8.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.1.0/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-20181126121408-4724e9255275/go.mod"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/common v0.10.0/go.mod"
-	"github.com/prometheus/common v0.14.0"
-	"github.com/prometheus/common v0.14.0/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-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/prometheus/procfs v0.1.3/go.mod"
-	"github.com/prometheus/procfs v0.2.0"
-	"github.com/prometheus/procfs v0.2.0/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0"
-	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod"
-	"github.com/rjeczalik/notify v0.9.2"
-	"github.com/rjeczalik/notify v0.9.2/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/rs/cors v1.7.0"
-	"github.com/rs/cors v1.7.0/go.mod"
-	"github.com/rs/xid v1.2.1"
-	"github.com/rs/xid v1.2.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/secure-io/sio-go v0.3.1"
-	"github.com/secure-io/sio-go v0.3.1/go.mod"
-	"github.com/shirou/gopsutil/v3 v3.21.1"
-	"github.com/shirou/gopsutil/v3 v3.21.1/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/sirupsen/logrus v1.6.0/go.mod"
-	"github.com/sirupsen/logrus v1.8.0"
-	"github.com/sirupsen/logrus v1.8.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/assertions v1.1.1"
-	"github.com/smartystreets/assertions v1.1.1/go.mod"
-	"github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/smartystreets/gunit v1.4.2/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/sony/gobreaker v0.4.1/go.mod"
-	"github.com/spaolacci/murmur3 v1.1.0"
-	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.1"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
-	"github.com/streadway/amqp v1.0.0"
-	"github.com/streadway/amqp v1.0.0/go.mod"
-	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/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.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/tidwall/gjson v1.6.8"
-	"github.com/tidwall/gjson v1.6.8/go.mod"
-	"github.com/tidwall/match v1.0.3"
-	"github.com/tidwall/match v1.0.3/go.mod"
-	"github.com/tidwall/pretty v1.0.2"
-	"github.com/tidwall/pretty v1.0.2/go.mod"
-	"github.com/tidwall/sjson v1.0.4"
-	"github.com/tidwall/sjson v1.0.4/go.mod"
-	"github.com/tinylib/msgp v1.1.3"
-	"github.com/tinylib/msgp v1.1.3/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/urfave/cli v1.22.1/go.mod"
-	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a"
-	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
-	"github.com/willf/bitset v1.1.11"
-	"github.com/willf/bitset v1.1.11/go.mod"
-	"github.com/willf/bloom v2.0.3+incompatible"
-	"github.com/willf/bloom v2.0.3+incompatible/go.mod"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-	"github.com/xdg/stringprep v1.0.0"
-	"github.com/xdg/stringprep v1.0.0/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.2.1/go.mod"
-	"go.etcd.io/bbolt v1.3.3/go.mod"
-	"go.etcd.io/bbolt v1.3.5"
-	"go.etcd.io/bbolt v1.3.5/go.mod"
-	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-	"go.etcd.io/etcd v0.0.0-20201125193152-8a03d2e9614b"
-	"go.etcd.io/etcd v0.0.0-20201125193152-8a03d2e9614b/go.mod"
-	"go.opencensus.io v0.20.1/go.mod"
-	"go.opencensus.io v0.20.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.opencensus.io v0.22.5"
-	"go.opencensus.io v0.22.5/go.mod"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/atomic v1.5.0"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/multierr v1.3.0"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"go.uber.org/zap v1.13.0"
-	"go.uber.org/zap v1.13.0/go.mod"
-	"golang.org/x/arch v0.0.0-20201008161808-52c3e6f60cff/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-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/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-20200117160349-530e935923ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod"
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
-	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
-	"golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392"
-	"golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/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-20190930215403-16217165b5de"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-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-20190125091013-d26f9f9a57f3/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-20190603091049-60506f45cf65/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-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
-	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod"
-	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/net v0.0.0-20201216054612-986b41b23924"
-	"golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/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"
-	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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-20180926160741-c2ed4eda69e7/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-20181122145206-62eef0e2fa9b/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190130150945-aca44879d564/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-20190523142557-0e01d883c5c5/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/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-20191112214154-59a1497f0cea/go.mod"
-	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod"
-	"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
-	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/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.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/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-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
-	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
-	"golang.org/x/tools v0.0.0-20201105001634-bc3cf281b174/go.mod"
-	"golang.org/x/tools v0.1.0"
-	"golang.org/x/tools v0.1.0/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.3.1/go.mod"
-	"google.golang.org/api v0.5.0"
-	"google.golang.org/api v0.5.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.4.0"
-	"google.golang.org/appengine v1.4.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-20190404172233-64821d5d2107/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/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.17.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.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.22.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.23.1/go.mod"
-	"google.golang.org/grpc v1.26.0"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-	"gopkg.in/ini.v1 v1.57.0"
-	"gopkg.in/ini.v1 v1.57.0/go.mod"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/urfave/cli.v1 v1.20.0/go.mod"
-	"gopkg.in/warnings.v0 v0.1.2/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/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"rsc.io/pdf v0.1.1/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-)
-
-go-module_set_globals
-
-SRC_URI="https://github.com/minio/minio/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-
-RESTRICT="test"
-
-BDEPEND="
-	acct-user/minio
-	acct-group/minio
-"
-
-S="${WORKDIR}/${PN}-RELEASE.${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/" \
-		-e "s/-s //" \
-		-e "/time/d" \
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/" \
-		buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	go build \
-		--ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-}
-
-src_install() {
-	dobin minio
-
-	insinto /etc/defult
-	doins "${FILESDIR}"/minio.default
-
-	dodoc -r README.md CONTRIBUTING.md docs
-
-	systemd_dounit "${FILESDIR}"/minio.service
-	newinitd "${FILESDIR}"/minio.initd minio
-
-	keepdir /var/{lib,log}/minio
-	fowners minio:minio /var/{lib,log}/minio
-}
--- a/net-fs/minio/minio-2021.04.18.19.26.29-r1.ebuild
+++ b/net-fs/minio/minio-2021.04.18.19.26.29-r1.ebuild
@ -182,8 +182,8 @@ EGO_SUM=(
 	"github.com/gogo/protobuf v1.1.1/go.mod"
 	"github.com/gogo/protobuf v1.2.0/go.mod"
 	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/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"
@ -215,8 +215,9 @@ EGO_SUM=(
 	"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-cmp v0.5.4"
+	"github.com/google/go-cmp v0.5.4/go.mod"
 	"github.com/google/gofuzz v1.0.0/go.mod"
 	"github.com/google/martian v2.1.0+incompatible"
 	"github.com/google/martian v2.1.0+incompatible/go.mod"
@ -345,7 +346,7 @@ EGO_SUM=(
 	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
 	"github.com/julienschmidt/httprouter v1.3.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/klauspost/compress v1.11.0/go.mod"
 	"github.com/klauspost/compress v1.11.7/go.mod"
@ -374,8 +375,8 @@ EGO_SUM=(
 	"github.com/kr/text v0.1.0/go.mod"
 	"github.com/kr/text v0.2.0"
 	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/lib/pq v1.8.0"
-	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/lib/pq v1.9.0"
+	"github.com/lib/pq v1.9.0/go.mod"
 	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
 	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
 	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
@ -455,8 +456,8 @@ EGO_SUM=(
 	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
 	"github.com/nats-io/nats-server/v2 v2.1.9"
 	"github.com/nats-io/nats-server/v2 v2.1.9/go.mod"
-	"github.com/nats-io/nats-streaming-server v0.19.0"
-	"github.com/nats-io/nats-streaming-server v0.19.0/go.mod"
+	"github.com/nats-io/nats-streaming-server v0.21.1"
+	"github.com/nats-io/nats-streaming-server v0.21.1/go.mod"
 	"github.com/nats-io/nats.go v1.9.1/go.mod"
 	"github.com/nats-io/nats.go v1.10.0"
 	"github.com/nats-io/nats.go v1.10.0/go.mod"
@ -467,8 +468,8 @@ EGO_SUM=(
 	"github.com/nats-io/nkeys v0.2.0/go.mod"
 	"github.com/nats-io/nuid v1.0.1"
 	"github.com/nats-io/nuid v1.0.1/go.mod"
-	"github.com/nats-io/stan.go v0.7.0"
-	"github.com/nats-io/stan.go v0.7.0/go.mod"
+	"github.com/nats-io/stan.go v0.8.3"
+	"github.com/nats-io/stan.go v0.8.3/go.mod"
 	"github.com/ncw/directio v1.0.5"
 	"github.com/ncw/directio v1.0.5/go.mod"
 	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
@ -541,8 +542,9 @@ EGO_SUM=(
 	"github.com/prometheus/procfs v0.0.2/go.mod"
 	"github.com/prometheus/procfs v0.0.8/go.mod"
 	"github.com/prometheus/procfs v0.1.3/go.mod"
-	"github.com/prometheus/procfs v0.2.0"
 	"github.com/prometheus/procfs v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.6.0"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
 	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
 	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0"
 	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod"
@ -611,6 +613,8 @@ EGO_SUM=(
 	"github.com/tinylib/msgp v1.1.3/go.mod"
 	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8"
 	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31"
+	"github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod"
 	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
 	"github.com/urfave/cli v1.20.0/go.mod"
 	"github.com/urfave/cli v1.22.1/go.mod"
@ -626,6 +630,7 @@ EGO_SUM=(
 	"github.com/xdg/stringprep v1.0.0/go.mod"
 	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
 	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/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.3/go.mod"
 	"go.etcd.io/bbolt v1.3.5"
@ -666,10 +671,9 @@ EGO_SUM=(
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
 	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
 	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
-	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
 	"golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392"
-	"golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/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"
@ -679,6 +683,7 @@ EGO_SUM=(
 	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
 	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
 	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-20180724234803-3673e40ba225/go.mod"
@ -701,6 +706,7 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
 	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
 	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
 	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod"
 	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
 	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
@ -717,8 +723,9 @@ EGO_SUM=(
 	"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"
 	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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"
@ -755,10 +762,11 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
 	"golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod"
 	"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
-	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4"
 	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073"
+	"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod"
 	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
 	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
@ -775,7 +783,6 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
 	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
 	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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"
@ -789,7 +796,9 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
 	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
 	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
 	"golang.org/x/tools v0.0.0-20201105001634-bc3cf281b174/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
 	"golang.org/x/tools v0.1.0"
 	"golang.org/x/tools v0.1.0/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
@ -895,7 +904,7 @@ KEYWORDS="~amd64 ~amd64-linux"

 RESTRICT="test"

-BDEPEND="
+DEPEND="
 	acct-user/minio
 	acct-group/minio
 "
@ -915,7 +924,7 @@ src_prepare() {

 src_compile() {
 	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
+	go run buildscripts/gen-ldflags.go || die
 	go build \
 		--ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
 }
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@ -6,22 +6,12 @@ AUX samba-4.13-winexe_option.patch 2611 BLAKE2B 709cc020ac7bbce948151fca511299ac
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
-DIST samba-4.12.11.tar.gz 18249361 BLAKE2B 74208769d42f3cb534855c77933b3e820cf1cbb02ea8748e4d208281427640b0b3071099ca51fde43454c2d24733a9ba81ef489fd17597e7cf8bdb2e450c7864 SHA512 8147f36bc56dd1b7b6603e1e51b83cef59273a591bac77ba8cbefe9df85b0f85886f983979cbfc8fd11eb4e7552944ab4e8ac2400acb3e2b89ec584363961df5
-DIST samba-4.12.12.tar.gz 18252232 BLAKE2B 4e5fabdbbcbf1df5e4a8966fbd55923c7fe97c4449574f0c17864dd9376197539ea29f59e00fc4fbb58ce18d4c7fcd8ab24e8f892edc9b32c646215287fc4bb7 SHA512 45ebed4cc73990993e800605391715afa2aa044e92bf89a62eb3ccbff97be2c9c4bf4a1f840a5d5d1d0c02704435c074e4ae386ca1729066b706c236c898c08f
 DIST samba-4.12.14.tar.gz 18260926 BLAKE2B 0a90d481b8c7ad44b5ceeb3586cc246f038c21c0dffbeded76707ac9f6993edac3dc469a37742c02bcb9e1808cad0df3dc6a4277c71422323c05d111bad5fe7e SHA512 40561c5cbf5988c45166e21a1eadf7050026083a0ad7aef8076c9b8a053113bbe9397b1a507abd75b52eb4e69dcdbf8bc2404ac72c515c5ee62c30fba4c768f0
 DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
-DIST samba-4.13.4.tar.gz 18429050 BLAKE2B b2141f5b39e849dce4607430fdde217535c6d9aa236807de2e8072415c0e408b2690ea7b335915d87f9a4b574615f282c6724886210d62ad1a059eed447a3e34 SHA512 fb7b0e2ad122a72ef534de6446e5a44b842553963fc331c68454e8ff761f16e921a0dcdd653fe6b5e90d4ccf28869bd13df53d615d86cccd85a5ec3589268cf6
-DIST samba-4.13.5.tar.gz 18426722 BLAKE2B d84b71cd8a925270670b7d302b527ee116cecf9d603baf1fc69c8527c657d5e2430e1b51e951476525fd95dc3392e5642a829a646c0eb254ccd7530bd393f1a4 SHA512 4187337fecf60fa133c6e81e894634f36028d34ccc521e5e856a5736a4f58fc2ad2cd136a206d141f17f7bc519a6168a27e83705fb2d38559667a60b24ad1c1f
 DIST samba-4.13.7.tar.gz 18432921 BLAKE2B 55e5a470a594bc56c942daa394e2d8e8b90dd0d1408236f7d69a60c609f1f4b1d5389209ef57e245ca326b271fba0b58fceea47681a90ab09828a4e68e40693a SHA512 eac0c0b60d50591ecd8e730bd6f24ec3d5731a9dd4172640259d841cca988f20265e5a57967a070713ab7b4bd95766a21247cc8e6b32177b79eb766520a3288a
-DIST samba-4.14.0.tar.gz 18635518 BLAKE2B ad1d091886b5da536a73bdbd4075f7ddc247e13a514e26c9bf993e8da5a3d737662ddd859c60d47a9a597e1326b96d7e8d083d5b15074f5875495cf68db58a24 SHA512 cf5767fc49b8c5832dd9711765e0b395a07964c3a618de10ae491123de7141eb4f083194b6120f302f5c4a196837a14070b8a8324412e8957af3706a5bbc6f11
 DIST samba-4.14.2.tar.gz 18636757 BLAKE2B 51b0b2a1543256cbd1ab121f0b90e6546761f2c0377256d3f9e804368ce73d07f6bfdc0cbb6725d438358e1e92e8e2f59f0b54e6fff52f8c07ff25398728e9da SHA512 8dd97abb14d531c3865747512abdf4d2db84b4daa5c15b67cd4f03326e30270d947ba0154493c5897aaa357039b472cfa669c80698b0f572e46d730f70a29b43
-EBUILD samba-4.12.11.ebuild 9732 BLAKE2B 2841627a44fcb86b3e4421b8777bc5adeaa8cdb287325aad54e3fdf9ad4d91b3b5d37f6d4e85060928402e6a6fa9170c4ccfd0e0338035ef752cad75a7d572a1 SHA512 23c5b5fa258914686f69cb7724ffc165539143fe5d85537937fafa64058c6ae63d09d3eed56f1dd7f87c895f76d632e89b250d61dc44834dea77de100b2fd829
-EBUILD samba-4.12.12.ebuild 9732 BLAKE2B 2841627a44fcb86b3e4421b8777bc5adeaa8cdb287325aad54e3fdf9ad4d91b3b5d37f6d4e85060928402e6a6fa9170c4ccfd0e0338035ef752cad75a7d572a1 SHA512 23c5b5fa258914686f69cb7724ffc165539143fe5d85537937fafa64058c6ae63d09d3eed56f1dd7f87c895f76d632e89b250d61dc44834dea77de100b2fd829
-EBUILD samba-4.12.14.ebuild 9738 BLAKE2B 19af47b873f75fe3e97f129e73a933c3202f2d82c927c6314e1824a6ee6f558f7da889657c42a8f5b35d3a737e26fc7cd8d7b4adba7d79257573d6d06291d707 SHA512 42a7ea2dfec157a5a1a487f8d06294ac60f54da422c45b57fa71d2689bf1bf9aa062d602c9bfd83fa7d659269849d1b221e68bf1e579bc64d95da33b6c554817
+EBUILD samba-4.12.14.ebuild 9778 BLAKE2B ab5bbf65f2f7e8f0f900582a02565cfc1c3645a27b11f740ee0e03526db175082204e424ce5404bc99391b40d4231b8416205bab37994fa6e741eee7ab1a2692 SHA512 c5b36100b7113f93d138dd75315b3512de718e37551ab22f7c4456f371c9cbf263fdd70e4cd6c08aaad7753be74b749ba0f66bd23fc1aa93e3ff73298dad29d9
 EBUILD samba-4.12.9-r1.ebuild 9771 BLAKE2B 7f5c318b381a854525bc7f92b781d4832b701c04334b0890fcde2230cf0a639e1b7e5956c247fb27856c3d65b3ec94a884bdd1b6621f83a550344b231ed265d4 SHA512 ad740fd5e49ebc3ee7ec48d70c559e3c82d54fecc944566322ce45bdf257450b76bc8d691748ad3d2e2a80820a4f3e4da2abcc35ca78279769d2ebb35ea58cc9
-EBUILD samba-4.13.4.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
-EBUILD samba-4.13.5.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
-EBUILD samba-4.13.7.ebuild 9825 BLAKE2B 277d9ed6a9ebab12f31f88f0a6bd88370f6ec869e19871e2caef86f063e3ce7a866a64dce5ff3fd8732f14b8bfdb94c56adb2673c6139d91df54dda81f989e3f SHA512 96a779a8b11c54eb45037a68970c674e744f0fbab871c352693d7ad182ded3eb58d175e8676398aa0a46c1a8ea8a39d5333601313f95a6efec912a40ed7ae1d2
-EBUILD samba-4.14.0.ebuild 9932 BLAKE2B 535396c759eeed6e3ad994d9dbc738ce14cc64ebd3ea3d73f2de12c81358b6f12ade18cafbc9c4203c77f9875ddb3e3d415bc11899da98f34e58a3b1168fe1dd SHA512 3288b583cbf0227f70c214091a86e9e52c861834fce398d39c499884b5a3db3d3e65df4d67c6b846cb576c9a0130944e7c588a7d1776a006b2d0f91d207d0047
-EBUILD samba-4.14.2.ebuild 9938 BLAKE2B 205109c4f64e37478d4d226303e62d143997d7b7842445abafa66788bfc1757afcb64430d48beea5eec15734e72d2a4039554932faa8b5cdc70bc0afaddd75b2 SHA512 61ec4875d2d89c2952fbcb2b9ce487a506586ecd0132d50aa309e481432e1b04da082b4c6b3f6f9df59bc93bdfab4035bb3c0ecc954d09710efa66dd0a545cbd
+EBUILD samba-4.13.7.ebuild 9865 BLAKE2B b780f3f0255ca6a723370d7814726573800fd85fbe7b430487df58123b6510472c189f674bf5e36dc309d46013e063b579b10793fa55fc7687b11ef545094d1f SHA512 70cbc1a5755fc3368a4d9d21e7cb95ca5b66f063ca0f74d47b30f5d102a99af5ae5b1e7acceedbfc9e8127641888936c5e27d5ebdcf5f39c553d7324117a09ad
+EBUILD samba-4.14.2.ebuild 9978 BLAKE2B db4d57fc0f4d1dca196c7e7874e2b41cb785211e3b521e6f376e2a00107eef4afc4b0063002ea1f07edd39ddb549d741ce7b5162e481ead1fbf0c64ac6fc8800 SHA512 5976815dc6b96d7825bffa7318133f6be012302125d7535187a8601b39e10f03f767a721dfe31d5a0af62fd0f2cba801d49b48bba1da124f6ce8a8954ba52e5b
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
--- a/net-fs/samba/samba-4.12.11.ebuild
+++ b/net-fs/samba/samba-4.12.11.ebuild
@ -1,328 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.1.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addns? (
-			net-dns/bind-tools[gssapi]
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-		)
-	")
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-REQUIRED_USE="
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable snapper)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware that this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
--- a/net-fs/samba/samba-4.12.12.ebuild
+++ b/net-fs/samba/samba-4.12.12.ebuild
@ -1,328 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.1.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addns? (
-			net-dns/bind-tools[gssapi]
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-		)
-	")
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-REQUIRED_USE="
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable snapper)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware that this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
--- a/net-fs/samba/samba-4.12.14.ebuild
+++ b/net-fs/samba/samba-4.12.14.ebuild
@ -15,7 +15,7 @@ SRC_PATH="stable"

 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
@ -53,7 +53,6 @@ CDEPEND="
 	>=sys-libs/ldb-2.1.5[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/libunwind
 	sys-libs/liburing:=[${MULTILIB_USEDEP}]
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
@ -62,8 +61,6 @@ CDEPEND="
 	>=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
 	$(python_gen_cond_dep "
 		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addns? (
@ -71,6 +68,8 @@ CDEPEND="
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 		)
 	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
@ -83,6 +82,7 @@ CDEPEND="
 	gpg? ( app-crypt/gpgme )
 	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
 	snapper? ( sys-apps/dbus )
 	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
--- a/net-fs/samba/samba-4.13.4.ebuild
+++ b/net-fs/samba/samba-4.13.4.ebuild
@ -1,331 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	acl? ( virtual/acl )
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
--- a/net-fs/samba/samba-4.13.5.ebuild
+++ b/net-fs/samba/samba-4.13.5.ebuild
@ -1,331 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	acl? ( virtual/acl )
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
--- a/net-fs/samba/samba-4.13.7.ebuild
+++ b/net-fs/samba/samba-4.13.7.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"

@ -71,7 +71,6 @@ COMMON_DEPEND="
 	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/libunwind
 	sys-libs/liburing:=[${MULTILIB_USEDEP}]
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
@ -80,7 +79,6 @@ COMMON_DEPEND="
 	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	acl? ( virtual/acl )
 	$(python_gen_cond_dep "
 		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addns? (
@ -88,6 +86,8 @@ COMMON_DEPEND="
 			net-dns/bind-tools[gssapi]
 		)
 	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
--- a/net-fs/samba/samba-4.14.0.ebuild
+++ b/net-fs/samba/samba-4.14.0.ebuild
@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	acl? ( virtual/acl )
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
-		)
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
--- a/net-fs/samba/samba-4.14.2.ebuild
+++ b/net-fs/samba/samba-4.14.2.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"

@ -71,7 +71,6 @@ COMMON_DEPEND="
 	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/libunwind
 	sys-libs/liburing:=[${MULTILIB_USEDEP}]
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
@ -80,7 +79,6 @@ COMMON_DEPEND="
 	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	acl? ( virtual/acl )
 	$(python_gen_cond_dep "
 		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addc? (
@ -92,6 +90,8 @@ COMMON_DEPEND="
 			net-dns/bind-tools[gssapi]
 		)
 	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
--- a/Show More
+++ b/Show More