gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-misc
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
294 files changed, 5627 insertions, 5686 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index cbd6e09f3c8e..63546fe53967 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 9bc2a929440d..511cd29a02aa 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -8,7 +8,7 @@ DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fde
 DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d
 DIST codec_g729a-18.0_3.1.9-x86_32.tar.gz 476626 BLAKE2B 7a8a0a763fcae579ac4be2891c691e7e540881cfd723a2c25af0c0f67499fde24a3d786d9ec9dddb6ee70e77973d71af6538d52963ff33b41d1940c8b506266d SHA512 bb223c03185d33107dc3cfa9393fe07950ae3a5825e1a347e26d06e9ffb8bfbc7ba350cb1e072dd52eaa6ded5a98e53dec9be8d8c55d89f0c816058a2f6bb247
 DIST codec_g729a-18.0_3.1.9-x86_64.tar.gz 475817 BLAKE2B ef45f1edab67b1fdb57d11340d2b3885c72d9f09f00fdccfdaa8674d61cf95ddf8ace223f29049e1e700f0bdcabd824ffbfa5382e492a1e0d0a47e1ab030d606 SHA512 12bbd2bcef0b7138d0ef261b6b1265f803526ce3c4ec371be830267e01e0e674150f17169742fe72737291b162136ea5224b320b655112cbc10fa207733c7f54
-EBUILD asterisk-g729-13.0.3.1.9-r1.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
-EBUILD asterisk-g729-16.0.3.1.9-r1.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
-EBUILD asterisk-g729-18.0.3.1.9.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
+EBUILD asterisk-g729-13.0.3.1.9-r1.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
+EBUILD asterisk-g729-16.0.3.1.9-r1.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
+EBUILD asterisk-g729-18.0.3.1.9.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
index 01114a23c866..5f5eeeb743d5 100644
--- a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
index 01114a23c866..5f5eeeb743d5 100644
--- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
index 01114a23c866..5f5eeeb743d5 100644
--- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index e30fe1ffc210..e1b1e988024c 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,7 +1,5 @@
 DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
-DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
-DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01
+DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
 EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
-EBUILD axel-2.17.8.ebuild 974 BLAKE2B 20f71b59b2fba73a6eae3cdcbe9863177be7c32edf7b24186673c514a71034789ea98c03d3589ec931723a45281e2d1b47053284b336db12929f660fd90929cd SHA512 bc806cd0ed64d74cb654a4c5d9a01a040d65dc35dcbaa31367d4e81871b9995a332aaf413ad1e8cda1ddf1e30b48f65edcf575077de0e6437a9666cf15358654
-EBUILD axel-2.17.9.ebuild 979 BLAKE2B 2674e0f45621ac1dda8b5139aa49f7cbad1cbffa159510b7800c7951208e687a139a86ff1f837ee53bcbbe2a67756d8251a12cf98d44e3ece019983b88865982 SHA512 0d00c387b1f13db45a6bcf37d040395e58b98aa1c2a19d203da06de2fbc85e19d02d444bf3064bb85add4cdc4952fc54d415a3abd094e0148e050305bb203381
+EBUILD axel-2.17.11.ebuild 992 BLAKE2B 3b66e241379fb0b083194d798a08a6473662c7a3319edc962fc3d44fd091010dd89f79d81f935408e8faf68cf4dddf35f58e1c998af04747d6ad504389f2b675 SHA512 0285dd384a68585cdda2b2ee446fd01e1a03856bacdfb12c027c6352cc6b5079af42e74b535a64c4f09935c4bd8dbb1c11649b0d12d01fc09af0794cdc8901f8
 MISC metadata.xml 335 BLAKE2B 8de02303ead90809cd34dcc7fed0a845e137b3ae3338ca44c10a9339da0ee5391ac183f17f0b59fbc9515eefa8daa0030bc009feef7f1400b0a76d4f2f6d5900 SHA512 41e63e21afcb123fbe05f43fe1958e4883d37eb2a1df38b013f95d6eb6cce6cba9819d4843b5a267f123bc145325bc09bb4f2f8ceac1000b750812fb367398ac
diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.11.ebuild
index c2b94b904b2b..f9fabe3a83d0 100644
--- a/net-misc/axel/axel-2.17.8.ebuild
+++ b/net-misc/axel/axel-2.17.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug nls ssl"
 
 CDEPEND="
diff --git a/net-misc/axel/axel-2.17.9.ebuild b/net-misc/axel/axel-2.17.9.ebuild
deleted file mode 100644
index 1a4eb679c275..000000000000
--- a/net-misc/axel/axel-2.17.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug nls ssl"
-
-CDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with Portage, one can configure make.conf with:'
-	einfo
-	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-}
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index c0bb88995f5c..0786f2b1ccfd 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
-DIST batctl-2021.4.tar.gz 116743 BLAKE2B 74dfecd1e07c5f6555fba9e184e887ecdb3c73d423f26af70ff5324acf2477e4ef0768197822e2fdd3e2626564d3b4e637c15a8af628f8e0d70ba48746c1186c SHA512 0a629ab6a52e503fc63b022abf5ada491e7ffd61e2ebda7a169b556b2362943452285d6a0177122634b8c7c0fafedc712d3d6fee82c03e6fd4e2d42d890f87da
-EBUILD batctl-2021.4.ebuild 768 BLAKE2B cac3d943b6214683adfc447a4b9ae70ff98b97d6ca3e91b3c226195b4d18365fbbe93fbf2e2207cf350c14890b524620be5308f7ca7bd75c320e079c67dcc589 SHA512 cbb03484a30693fc5881a167f349b65bb3d5d6ebf570211fdda7983f31bdf9553e2af0ddfc7e0caa813bafe09d8c0fab29c4d32ae52a54748d1f764fe098ebd0
+DIST batctl-2022.1.tar.gz 116858 BLAKE2B 1de12d207c9fc3201c557f02d06d81b42cb3038b82a2ae8c8255e20ae3078d25a8f9f2bf39a96f649c42541c5b1a4796baaf5f30d4534b40b24c2df06c17ddbe SHA512 4e268b5ec7cb07fed08b8688e10c603b788ccbe3cc3c84e536ba27cf2e54e306b49d86a9f9c657627c673a48029834d0454db53c0fa46d7fad5e2095823828f5
+EBUILD batctl-2022.1.ebuild 768 BLAKE2B 4171374cb921e00eddbca6b4c2fc7de061e28b8d592fcbba639f0a02aea6169cadd613ceed436678e90f64e91dc0c3862bc46de718e008329f5ca93e338e29f3 SHA512 948ca4773b735fe14111f121e4ff9e3fd0674139b19821af5a6fdd8a0def66968ea9f7d6e30f3bc43003118d0a589590bdfefbd558c51d200ed4215743c9a39a
 MISC metadata.xml 406 BLAKE2B 9d64c2ede4ba26b9540721299b25eff6d3037a209f51b7e81a646b924e2944a411f26d5511be5545d2648b4663323280fbb51d57198d81668d41dc20c8a49cb6 SHA512 17f94d08a64d16283477c9bf6d887b777118cc4727df5f7668cb345556570ed69c564d770f411ee2203f34437b1a265f16a41aec88b25b4ed4b66b3a71d65a99
diff --git a/net-misc/batctl/batctl-2021.4.ebuild b/net-misc/batctl/batctl-2022.1.ebuild
index 6dcab8083ac0..03a22398411e 100644
--- a/net-misc/batctl/batctl-2021.4.ebuild
+++ b/net-misc/batctl/batctl-2022.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 98dd3cfdaf3c..c2853c03b8fa 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,8 +1,5 @@
 AUX bridge-utils-1.7.1-musl.patch 223 BLAKE2B 16545001ffb6d3a4db3af66adda46f76d2436be78b7ebfba732de5d146b909f9ee7be4ad5bbb1dca6edc517ace3d2994fa6c1eab24bf1db3530076d2411a4970 SHA512 9f80083f6893e2ef1b960ffd602307250ef29fe002f6fa3ee769f7e5a0a7b162b1f9fe8fa028431720b1a7e99a2050864ab624e3a4a11a9012a0174010e9dcd4
 AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb982957d2e3a1efa0244b4d9f72decbac8990579b19137df82e758589846e4175f3cc9ddc9e2990663b3ae146cf67b9f5a808255115d1a91d53a3d50 SHA512 b4aecaa7e7fae311effc2f9ccd4ee5ca2a1be007cb94e1eb873693805fcdbc880bfb0df53d592eef46d61d433c7b5a36dbe9e7c16b836b6a3f1452e4034f50d6
-DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c
-EBUILD bridge-utils-1.6.ebuild 1436 BLAKE2B 42f9eab53b9e394593c7b9f78f988a5558cbb0aca979e9adbfd96bed3824e2ab1aee9b974df1870a94a639778a90f19b1bd5af3a42dc9f646181bd55dfcb5367 SHA512 002a1d7fbf2f2b756f2c15d73b6d9e7acca1c6d3295a78a19e578de82967d50ace95167a98a060254195719369c5a9e7669b2d262be120f9a1a906619740843a
-EBUILD bridge-utils-1.7.1-r1.ebuild 1434 BLAKE2B 13d9dfd6d950dd5c39db149944d6c133335dabd03d6784500bfa843e2dfff6f3e343d8ef302f98167c82206f908f0a92b50e7ec48beb70c22ba6964783dcdf44 SHA512 d6afdb713dbb99809d5d906683e9939b78434dc1832f42f2f4bc6f0bd1c7240ed29c470fa56680e76fd13aebce53f71d84d152f10fb574a792c78a9b258ece45
-EBUILD bridge-utils-1.7.1.ebuild 1379 BLAKE2B 62267a7aadaaa12fe07c2679c8beb99e6917d6c39ac3697ec696300f897c140fd2cae478cf50e1cd8668f1a3fb96dd5fbcc8c6ba69930e90ba70a679382186c1 SHA512 1283f3f38a9fe0e0065e4101b45d326df424651d708b9c0891fea6a52755cbe313717e37cae25bfd37f385b70c685a4260ea04419d913d1a5fc27279c3dbb5b9
+EBUILD bridge-utils-1.7.1-r1.ebuild 1427 BLAKE2B a6aa67740a404680bb52288113416fa0b5d9ebc8a2e61d68897751e5700bc4313c0583463bf57ceb1cbcaab30d06dd57f7f70733e610ab4b041783a59a2a1a8c SHA512 be36e4d63654676523dc5de0fc6eb2fdd7dd3d952e80203f3a25f42a6825f6825bd321840df7fc23250503b926c051b5a60f9f0d1d0c05a8100bfc6263b0d083
 MISC metadata.xml 492 BLAKE2B a62977b2f90df86ceacd84e556618f3adf5338eef114a17ca9a17e4bff142190fa68df777719b91bc4ec3108d3fd13c21205addaf30e4fc4012ff83fb882590f SHA512 216e32dc64a175f83b942cbc24894e055a77f7b9c251d68395cb4635bda446ea197f8feee7957747e68bdb46c8c84e8625b626c82944e161debba3009f9befa8
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
deleted file mode 100644
index 273624c416b4..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
-SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="virtual/os-headers"
-RDEPEND="selinux? ( sec-policy/selinux-brctl )"
-
-CONFIG_CHECK="~BRIDGE"
-WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
-
-get_headers() {
-	CTARGET=${CTARGET:-${CHOST}}
-	dir=/usr/include
-	tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
-	echo "${dir}"
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
-	)
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# use santitized headers and not headers from /usr/src
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/usr/$(get_libdir)
-		--includedir=/usr/include
-		--with-linux-headers="$(get_headers)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog README THANKS TODO \
-		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-	[ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
index 1ca3e88935d6..d668c78e802c 100644
--- a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="selinux"
 
 DEPEND="virtual/os-headers"
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
deleted file mode 100644
index b3ea6ff1a706..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="virtual/os-headers"
-RDEPEND="selinux? ( sec-policy/selinux-brctl )"
-
-CONFIG_CHECK="~BRIDGE"
-WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
-
-get_headers() {
-	CTARGET=${CTARGET:-${CHOST}}
-	dir=/usr/include
-	tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
-	echo "${dir}"
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
-	)
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# use santitized headers and not headers from /usr/src
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/usr/$(get_libdir)
-		--includedir=/usr/include
-		--with-linux-headers="$(get_headers)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog README THANKS \
-		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-
-	[ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
diff --git a/net-misc/bsdwhois/Manifest b/net-misc/bsdwhois/Manifest
index 1d9a0bf543db..14d5de111d6c 100644
--- a/net-misc/bsdwhois/Manifest
+++ b/net-misc/bsdwhois/Manifest
@@ -1,4 +1,4 @@
-AUX bsdwhois-1.43.2.1-musl-cdefs.patch 357 BLAKE2B f7e32907c3df769eb37c65625fc8a9e452d920fe73948bffbfab37c25b782175844b81c39b0004b8267f1fd8b77a92dced6d84625d488448f230c8d29ae7cdde SHA512 49857453c288f4d8ed23309345d934d5e81da1ff314ff33e53bd2baa6625299e52a514c90fb03ef43e225bf84439fe9835a8ce552f1401f1a28ec733f72e1061
+AUX bsdwhois-1.43.2.1-musl-cdefs.patch 508 BLAKE2B 3db720af35df824f2107ab84147ddfccf63bbbc9c85d88a6e33785e3b0b89b008aa2e161effc49dd224cec3f1b1013be51c789318074c224523756ac8cb2414c SHA512 adccd80534475b42f6d1b910e251b1fd7fc1290497a0e66efcc4f83d4c3dd39168690330b9d1a15563a39f65e081ee1d42b050224c8d195d3398736809ecf050
 DIST bsdwhois-1.43.2.1.tar.gz 85895 BLAKE2B 584bec2f58deee1208b35df1dae0b638049eab990cade979f56022b701d24b2cd653feb381f79e89610246743c8b20df2c7b83cffec68e3a00a9169c79edd7e5 SHA512 c1b3f93b8d7f838478d59cb70a7326fba84f87e1fcb4af9e7cc64ac1928adf96b0e6facbd6dfabaa7d146f0d1ea1abe1330771be4c7a6f3590d3c9e86a3b53dc
 EBUILD bsdwhois-1.43.2.1.ebuild 507 BLAKE2B 931770ea6e38b6d2285ebf3b12e3ac7b2d455d83900fe31bd45ce17e32f0a83d7c7c975a6e3213b00a17c28b8c3a86035dc1848a5fe5a00f099375fa127d3a42 SHA512 1d6d282564a81d4098dcf217f9a1923f8a876710b295f185e3467f1ed4365723805281a55185cc3c9fb14b7225f23365ef6844fe53cc136529777d2f487b9f93
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
index 2eec53c2645c..a27f2d5a1665 100644
--- a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
+++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
@@ -1,8 +1,17 @@
-diff --git a/whois.c b/whois.c
-index 329559a..d2f6561 100644
+https://bugs.gentoo.org/828901
+--- a/strnstr.c
++++ b/strnstr.c
+@@ -38,7 +38,6 @@
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
+ #endif /* LIBC_SCCS and not lint */
+-#include <sys/cdefs.h>
+ 
+ #include <string.h>
+ 
 --- a/whois.c
 +++ b/whois.c
-@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
+@@ -43,7 +43,6 @@
  #endif /* not lint */
  #endif
  
@@ -10,3 +19,4 @@ index 329559a..d2f6561 100644
  #ifdef __FBSDID
  __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $");
  #endif
+
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 9bafd2ebbb7e..5e12d62617d6 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,8 +1,8 @@
 AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a4869437d2d392274c0f0586153406480eb1614297420e161285d981eedf03a4e090a309dfe55163e13387bf4c649586847ccee64dd2e88f9c7263b6b66 SHA512 f4aa5a2473c1872d06fea2611594f63c888717cd93618587b020dcb6aaeb7889443358dbc74da5c7763fb6ef08a6ecf9345d94874c582c799abbf8db8957c790
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
-DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B b7ac12e2f1c16781225b9c74e558e51d817aad5de2d953d94a06d5d3fa0d937dd317f7157c770e01a91c249f0192542da67911899014360c6fadd252bf0908ae SHA512 86d4ac9b15da2b29f7245866dbc78a131c6aad8efb8ac4f150935afdd5ad95e8f2bc4a59cda52849c96aadaa869b05f9eb7a5cdfda711358e5055e08cf9fbd79
+DIST chrome-remote-desktop_103.0.5060.46_amd64.deb 18955612 BLAKE2B 048bd46e19f61a15f9c114608677c1ba41aa256be471d8f6925c98e806fc362ae2833dcf843b271ec6409f2cd2be6182be7d82c2f3170f866c3f6aecc29323b7 SHA512 a78aa8cb50c1aaa5db2393a5cc1de09b98d5edae16a257f3f654e488f0383844c9eeeb6a2fc8d645e32f07a0dc3b05ec45143a4cc792576743b4a2db2cb6bd0f
 DIST chrome-remote-desktop_99.0.4844.11_amd64.deb 16817980 BLAKE2B 4784fb597722ee8abe3d073c7c2a0c1d1e9796e5c6df9935a2b5d2c4d6ee3629738c0bbfd6528a45b85b95ee192b5760b5137b7d89bd543d5c43d56fd9a030bb SHA512 71c621d1484f80b07b04637b1472baa1072b726109f9786ceabb1393bc1ebd3fe90c546d695871924a3a243840c87e35de78ff07598fbe6f3fe9fcb22b335b65
-EBUILD chrome-remote-desktop-96.0.4664.9.ebuild 4808 BLAKE2B 26d9e5c83ac126f414f3dab199f50972965fe777c2bf55db298c2ed82f8fd5cb14cfacb12c249544c2fc7cc24ceb181759e3be0b10dd8df1e943b6f8a51cad39 SHA512 db708de2928e175d476f127a60c5c878cce3db19c6a0298a4a04447c1fb4671ee383a0307b5267c743e4b32630069c4ce49bc5dea56b07e77e9e37efb9867368
+EBUILD chrome-remote-desktop-103.0.5060.46.ebuild 4808 BLAKE2B 1ff119f4d33e81f69d5b34ee743ccd645b7d5cc391012adf63a30d169fe5603264ff061da06377b575a453b31045fa9cbb73cb5cec58637ba284f97200898fe1 SHA512 fa1df0c86ff168a328e086da5903b3c1dfd470ca8b3da173b47ae8303e10a5077370528d95316137b78799cbcd02b2a0c8c0b9e1e2622cbe0d4a0757ba754a19
 EBUILD chrome-remote-desktop-99.0.4844.11.ebuild 4808 BLAKE2B 1ff119f4d33e81f69d5b34ee743ccd645b7d5cc391012adf63a30d169fe5603264ff061da06377b575a453b31045fa9cbb73cb5cec58637ba284f97200898fe1 SHA512 fa1df0c86ff168a328e086da5903b3c1dfd470ca8b3da173b47ae8303e10a5077370528d95316137b78799cbcd02b2a0c8c0b9e1e2622cbe0d4a0757ba754a19
 MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
index 65b1951d7a70..489accba4990 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 3f14d6069dcd..24c937006629 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,5 +1,3 @@
-DIST cmst-2022.03.13.tar.gz 3178885 BLAKE2B 0f67d4b63c1d9c5925811ae11cd6e0a16c7edefaf802dfcb7847b5e1ce5dac8435343523b5b6ba863c08d49340a06a16df65f057b7297ff874768b929e30d676 SHA512 ed8ccec8c132bfdb42bcd8429d6b25242ff2575eadf5c60afe04477a3962eb474b841c57cc4dca9345cb61b1a2502873ac91bb97b6766e637ca4254d82856a1e
 DIST cmst-2022.05.01.tar.gz 3427199 BLAKE2B 3e48c45d5ce45259934af95eeb0a6462a62a7caf2c4eb030487c66d1c25ccb6204dd312e778a97310026dd3f7622b43c6b02c6dc750fe81400a756366be6d3bf SHA512 54a3cc6feee7e388d0b84967796b5d3306fdf0c5a1dde17ccaa582f4803841ea624894e6cd9afc4566d6972c1981e848dc12fbd0004669341821c068064770c8
-EBUILD cmst-2022.03.13.ebuild 887 BLAKE2B ca3214162a928ab5975c15a02c29ee01bdad629aea7688a81015e3223d8e285ec061f6fe4c2f19dfb4c12e4fea21750c364a763e1002203c3d1a3a4636fb6e23 SHA512 e9bf2d363d20911881d689555e093ca4bc6cde6a733efe6d3d6fdd7292630fc9a24c63a60e0cd5470072de8aa1bcb7ba2879254e1305e53b6f624869bfc263a5
-EBUILD cmst-2022.05.01.ebuild 889 BLAKE2B eb54a7fcf2e5dfc74c2f2a3c14f7377dc5cba74c07f1a546888dff89abf0a34f46e94e96d4b2aa92995bca56af848a4ce5dcec969407e40d38423556dfe5a049 SHA512 26b9525df4fafe9b628a43099c3c6f1860ac102e842992378230250d197661b1ebd6a625ee94b2702ae616d11a201d098dec5da6aa590b9de5e056c9747a9282
+EBUILD cmst-2022.05.01.ebuild 887 BLAKE2B ca3214162a928ab5975c15a02c29ee01bdad629aea7688a81015e3223d8e285ec061f6fe4c2f19dfb4c12e4fea21750c364a763e1002203c3d1a3a4636fb6e23 SHA512 e9bf2d363d20911881d689555e093ca4bc6cde6a733efe6d3d6fdd7292630fc9a24c63a60e0cd5470072de8aa1bcb7ba2879254e1305e53b6f624869bfc263a5
 MISC metadata.xml 390 BLAKE2B 19055fbf6cc2b268ff117e4cd4e39c894452cd7a3f9c71a113831a142ee4458aae99f86497fc85ee5e29ee73a50d2363ce816e46e2cf3cf47e6be51658d882d2 SHA512 fcc4db887275f29a69ddb8d731f3bc1516734b75bb5ce494d2ddfc13f951a7c1ce9f715383c62725919755b61488943f91c1286d126fb91a24176c24e0e3dcaf
diff --git a/net-misc/cmst/cmst-2022.03.13.ebuild b/net-misc/cmst/cmst-2022.03.13.ebuild
deleted file mode 100644
index 45b56952a1ac..000000000000
--- a/net-misc/cmst/cmst-2022.03.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/connman
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5 DISTRO=gentoo
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${D}"/usr/share/licenses || die
-	gunzip "${D}"/usr/share/man/man1/cmst.1.gz
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/cmst/cmst-2022.05.01.ebuild b/net-misc/cmst/cmst-2022.05.01.ebuild
index 72cbdbb60aab..45b56952a1ac 100644
--- a/net-misc/cmst/cmst-2022.05.01.ebuild
+++ b/net-misc/cmst/cmst-2022.05.01.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index a4ed5e3c26f0..da2d7652fd7f 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,6 +1,6 @@
 AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772
-DIST croc-9.5.3.tar.gz 2847753 BLAKE2B 7ba9f321f3e6edb3e9332ca1e71ef3bcd9ec96ec2040ea00b861e5caa4427035ac4ffd1fbb01ebd944cd77f37e52789f2d6f0fe589646725b25ef2c59a4668e1 SHA512 b4f237af9d36cdf72b993ebbfcb9502f13f383d45888057394a9fe78ac778eefbf9a61268df6e584e8880879195ab1f30cf59ff2b74bfdd16b1d451c8670af5d
 DIST croc-9.5.5.tar.gz 2868323 BLAKE2B 52fda421cca32ec2f1f45f0df8e38e44c7dbb161856f9624665816b60957f5906ec01b4bdb0efd769974d2eed6f423adf987397a2e6e064e48382286d5c602a2 SHA512 7bb4f23dc6b0f809da87d67b10cfb1530cb138a3a70c9578b35de602ddf90cd0f61c2ba643a83d990890a07de29588b1387b83ac63b8eac2a75620a221330eb8
-EBUILD croc-9.5.3.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac
+DIST croc-9.5.6.tar.gz 2868248 BLAKE2B db9d2662ce4683767a57b88c7e06240243a93b1e0fadaa2d4ca42427df241afb5c9b290c879f18d59aa2600c8b8efc7b1716acdf1b11f57677d8d4672bd960bd SHA512 3342e0bc6e45c38653d2cca99d6e1b7b79450bdd05c77f3c073f0a4573a99a74b38da36d17950b5da49f99093dbc04c67f03816e3e831770491f0660e78b9266
 EBUILD croc-9.5.5.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac
+EBUILD croc-9.5.6.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac
 MISC metadata.xml 327 BLAKE2B f52f36927c80520e4bebaf1e63792cbbf31642eb2a7a4d233446a8328a2c02a69e8662e4f2c0de85228ea2331997f9c432c38d2073a8e1e51f4c024366a8c537 SHA512 531ac4904fbd95dced03613bc852e0d531e8f8498b49741edeefb396be44b8931f716007aaa36cdd1fb257735186a7be9fb6be994881f613dcde5ad6470212a0
diff --git a/net-misc/croc/croc-9.5.3.ebuild b/net-misc/croc/croc-9.5.6.ebuild
index 03dce788293d..03dce788293d 100644
--- a/net-misc/croc/croc-9.5.3.ebuild
+++ b/net-misc/croc/croc-9.5.6.ebuild
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 74e700cd26b4..17bfaad5d167 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -12,9 +12,12 @@ DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535
 DIST curl-7.82.0.tar.xz.asc 488 BLAKE2B 9da4ea63671621df956aa5dc191cfc6c8d2a8b1958416ca58ffc04d43ed65b89244968588879e6bd3299ca8f60b1eccb34dede012f8a2a37acf3ca34021da958 SHA512 1f14d8ab55360ba735dff916369ee318e98767718394654ce9443b6013509b6d3ed5597685b142e9823cec7496373b709a8656515d66039c06783879655151fe
 DIST curl-7.83.0.tar.xz 2472560 BLAKE2B 0669f40265a56e7549e8038ed8421680d7264bff44dcc0692cf9f5248621311be5e228314710149bf9d2ccbe739f929039e04402c1d04a1362d0bbf08cb8cdc7 SHA512 be02bb2a8a3140eff3a9046f27cd4f872ed9ddaa644af49e56e5ef7dfec84a15b01db133469269437cddc937eda73953fa8c51bb758f7e98873822cd2290d3a9
 DIST curl-7.83.0.tar.xz.asc 488 BLAKE2B a8f6dcf00f1b01b457a7eecc8364538393f414df60757f3664709c62b6007023a34ddf4ecb4688734e396031d30905b490dd0c115f09a9428db6a6be97cdf72c SHA512 8fb90f9692f4fdb82ea49f0e5151219b2334da5d3910f28e787bb688fb055b8b028ccf75cdcc15cd9f86d780d479f88f902fef7d7b9e007a4b849cb25c6c13cc
+DIST curl-7.83.1.tar.xz 2474940 BLAKE2B 491427b12f082c2246ef6cb2a129340079db28bd93b4381889e7328bef1d61a79bb57cba4b8372759baa4f6e77644966ed95cfa8f839ee9db634786757fb1ce0 SHA512 2f63327d6d3687ba36fb7b8d5d3d15599eca33ebfb08681613612ea9c4b629d3b6ce4d2742fa1ebd7a997ed332001d3a4c798985f9277c83b9e7a9aecdb1b1ee
+DIST curl-7.83.1.tar.xz.asc 488 BLAKE2B 78f7a6d9a32cab97e9ce26430eb2be2bc4e20552cf8c59238f30f127e9d7af5b4f9808c3fe0846c18c8f7a67b49f2f75d865d17b7760bb664872934799949441 SHA512 f0d29de315488c844eb81ed5a89ed6334910970224c8cac43e7e6f2d58c35ad0064c0b6122e69b3a34ce91f4b56873c63e2e8aea1c602ef40711bfd62a01b191
 EBUILD curl-7.79.1-r1.ebuild 8166 BLAKE2B 69d521028d1ff2d37b270539c8ad37a8033923d60ad057a347b843587a035c0afb829361fb605ef4186243657bef6a94156e493321161c62d16ecc2b4a73d0f0 SHA512 05ef78d4080f609ff1a5deb191d1d7d09ddfe58c617cd8688c231c4e71268784ebc9c2eee1a5a023488868d23b15db7b04718e6e7a3b4dbe17ac9880eeaa1eb9
 EBUILD curl-7.80.0-r1.ebuild 7715 BLAKE2B 13c87739394cb6a67ba281c62ff526f90cf1a569bb1efde7062b7c68ed778df5a21cde4539fce35e9585121618db7bafa57546b3bbdd9f7db0e9449284ab2ad0 SHA512 e7f91f01ff332f7a72aeceed4f739da7b8d950ca0574e541c4992e9a254168102d3337c09d18748ae326b20cb64d6eee78bdc672ef4497b5a925aa7f1d475f1f
 EBUILD curl-7.81.0-r1.ebuild 7715 BLAKE2B 43b427e5dcc240c051bfb8e01d876af9b1cf73a6016035893bc3024d7ceccfd72615bd327f5898a58ddd6c772953d7d2a30613cb70bca92cdbdf904bd6782ab2 SHA512 b76b11e4cae0026c4a887218be05dc49ec261e493891183dec84d07f1238437a12598a9db7ddf20731b69564479e1da2278457f41990ddd1d4da5a20deed9c31
 EBUILD curl-7.82.0-r2.ebuild 7787 BLAKE2B ce60b96c42b3803fd2bf8d55dba99267ce8ac34796bbdd93217e5e767aa4ab0e5bde123e8dab78ce5fa4dcdcbf7887fe9a16171dce06f30125acccf8b38048b7 SHA512 65c6d9765a799e28bdb32e35831c6de269758f2058aef9927b434de9ab6bb91e3db55225d7c7606099db8395e6997a3ca0c4d02e48b029851eea6edbeef43ba1
 EBUILD curl-7.83.0.ebuild 8371 BLAKE2B ff1769914582fea62d02521d4e9bf858151a6c4f4fd9460eefd88c8161dfec5ea1e4433044af508d022018c0428151f6fc5b032e99cbdf278690601ce9f01b2a SHA512 fd1f368701c446ef3c4c8e79b1fa5734ab618923b702d56dccfaef911ccb1d2ebf37398677e6c150e97496f683bf3bc39e36fab5afcc71b785730527dec4fc77
+EBUILD curl-7.83.1.ebuild 8274 BLAKE2B b9f06416a4b68a17616c90d91be3a629020110aaa7c3d9caac79937c3606982f0c28d4fe8a798311cdf623e62455d4c6aa8708faff46bb1805ed2a514bf014d9 SHA512 77992858391e805764c4b5b9eccff0e87465def7eeb105151e5a5754270d29e5e815d4239f90c6543dcad90dccac46cae843194e278ea8335aa1669a8deff4c8
 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.83.1.ebuild b/net-misc/curl/curl-7.83.1.ebuild
new file mode 100644
index 000000000000..a3fd859195dc
--- /dev/null
+++ b/net-misc/curl/curl-7.83.1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
+	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
+IUSE+=" nghttp3 quiche"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss --with-nss-deprecated )
+		fi
+		if use openssl || use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		$(use_enable ipv6)
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--disable-sspi
+		$(use_enable static-libs static)
+		$(use_enable threads threaded-resolver)
+		$(use_enable threads pthreads)
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		--without-msh3
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can disable tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 23f64095dd85..3f25be85b9b7 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,11 +1,6 @@
-AUX dhcpcd-9.4.0-memleak_fix.patch 730 BLAKE2B 705d0d6a203560315702af8ccd491cd3529cc7abe5038cb3a8881acb88e5c14d3bb75af267e2ba338e4ef4a6a9b85c0b47ca004f30b2018d978214f260e46fb3 SHA512 3a2111468bb8def0353b153c6d234ee70e7de9606ec4463ecf3276afe82dcbd772138ac7b429c6723112d61f0b22e27760deaf43a2838b7406d8886a29f6393a
-AUX dhcpcd-9.4.0-sparc_privsep.patch 1657 BLAKE2B 58564b77f97fa469ae64747915ac27f733e03d833d73edaac64293f1552c3be9128091683b061a05095244a3c59729f3aacd69ca3220bfb3f66bcf09112dedbc SHA512 d9dff010beb3eccd8f6f3adfa9ab2162d16b504f17f6f66363930be693760b16e1f226591e7486e893e99511480cba29d5baaeac1d23e5387e6e5d0e8f4dd1a0
-AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9185b9bf71e80d9b0d6a03d77c1cd5ca7b7a4dab468d5299887443e8e1ef17556d89d569eebdb8eecfbe0e0bf91b381d116 SHA512 17325af7fd51dd9a6eb7edf8e952eb096c054414a7ad7fdf242d19500222832e994815ed9eb3aafb7a68a62dbaa7c9b9e77dc7b632919127662c805e4117f11e
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
-DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
 DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
-EBUILD dhcpcd-9.4.0-r1.ebuild 4778 BLAKE2B 509b52d1d4334116b1c5d3fdd41e53ee52b206c1f92e58402384b8d9b8c85370a9f008aa2028293c0a450542dea53bbc44f4d26b4999dd298ea3e478295991a8 SHA512 2605a40bc99c35f1acaf8beeedc37d2ee4e82b2693bb0b40b004d785718b54ee0c8bda11f621e5d2a9e62c465380ca061b8e61384eb5f5dd8a183ef018e10bc0
-EBUILD dhcpcd-9.4.1.ebuild 4639 BLAKE2B 7fba6ef68f78a85ba37f82f67371d05ff49d7b0c1e40ce66773a490523ae7364a9fd2eb4a432bab11d806ac752fe9343cd23bb1d85be6fc8fe23cee913d4c2c9 SHA512 bc6b360259c18262fbb9fdcac56324ee56d2726157222fdf021fa8bcdaee6932bac285554faa186b31c6eee221031f9e6b4b4bb85a8fe13e851662c3290e26a7
+EBUILD dhcpcd-9.4.1.ebuild 4646 BLAKE2B 9f2447bc68012dfd41188f10d62729958b1abb3804e44abb5f65cfd2ee3086fb28cd9530b420e4a0597ec9ab4af4aab7784dcbe935adfc2b017e34b3dfb8025e SHA512 63f8ce073f061a76f8c9e41b3601d4ecd13ab3471443d6cfe73149333c3bc0452f02d6bd96cfbfac664bf6b5f315eb664ec45e673ec71086d23c9e7e4e26ca46
 EBUILD dhcpcd-9999.ebuild 4647 BLAKE2B a722a65460483c3eb185c6ab5a11e09a68f706b50ec1e2d73f0e32e88e33000d04290e98d88fea1f439a9f0d86f09a2d6573441ec4501a353630b8d1f86c9d2c SHA512 448bbe2b5d26c1ab2ba0d35e2e6d87ea936771342f825aa330de01f0cfa11ba14321d474111f17726c79c5bb6395dc5212a191ab3a1eda15f063876b80d935e2
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
deleted file mode 100644
index a4794b63f7ea..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
-https://roy.marples.name/projects/dhcpcd/"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-memleak_fix.patch"
-	"${FILESDIR}/${P}-unlink_socket.patch"
-	"${FILESDIR}/${P}-sparc_privsep.patch" #776178
-)
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable debug)
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(use_enable privsep)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
-		$(usex privsep '--privsepuser=dhcpcd' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
index 1aa27d0a3b4e..b7d172155d9c 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
deleted file mode 100644
index 61aed69656d3..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 24 Jan 2021 22:53:20 +0000
-Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is
- reopened
-
----
- src/logerr.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/logerr.c b/src/logerr.c
-index 21e933b8..35268870 100644
---- a/src/logerr.c
-+++ b/src/logerr.c
-@@ -484,13 +484,14 @@ logclose(void)
- #endif
- 
- 	closelog();
-+#if defined(__linux__)
-+	free(_logprog);
-+	_logprog = NULL;
-+#endif
- #ifndef SMALL
- 	if (ctx->log_file == NULL)
- 		return;
- 	fclose(ctx->log_file);
- 	ctx->log_file = NULL;
- #endif
--#if defined(__linux__)
--	free(_logprog);
--#endif
- }
--- 
-2.30.0
-
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
deleted file mode 100644
index a91db28d08c7..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 5 Feb 2021 09:25:12 +0100
-Subject: [PATCH] src/privsep-linux: fix build on sparc (#26)
-
-Fix the following build failure:
-
-privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined
-  203 | #    define AUDIT_ARCH_SPARC64
-      |
-In file included from privsep-linux.c:35:
-/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition
-  392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT)
-      |
-In file included from privsep-linux.c:36:
-privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
-  215 |  BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
-      |                                      ^~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/privsep-linux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index d00894ab..5c80c1b3 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- #  endif
- #elif defined(__sparc__)
- #  if defined(__arch64__)
--#    define AUDIT_ARCH_SPARC64
-+#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64
- #  else
--#    define AUDIT_ARCH_SPARC
-+#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC
- #  endif
- #elif defined(__xtensa__)
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
deleted file mode 100644
index 493e9c342f51..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Tue, 26 Jan 2021 17:37:29 +0000
-Subject: [PATCH] control: unlink privileged socket when shutting down
- without privsep
-
-Otherwise we have a connection refused when dhcpcd starts again
-as it sees the stale socket file.
----
- src/control.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/control.c b/src/control.c
-index 71405ed1..a601ad0a 100644
---- a/src/control.c
-+++ b/src/control.c
-@@ -50,7 +50,7 @@
- 
- #ifndef SUN_LEN
- #define SUN_LEN(su) \
--            (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+	    (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
- #endif
- 
- static void
-@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family,
- 	}
- #endif
- 
--	if ((fmode & S_PRIV) == S_PRIV)
--		strlcpy(ctx->control_sock, sa.sun_path,
--		    sizeof(ctx->control_sock));
--	else
-+	if ((fmode & S_UNPRIV) == S_UNPRIV)
- 		strlcpy(ctx->control_sock_unpriv, sa.sun_path,
- 		    sizeof(ctx->control_sock_unpriv));
-+	else
-+		strlcpy(ctx->control_sock, sa.sun_path,
-+		    sizeof(ctx->control_sock));
- 	return fd;
- }
- 
-@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family)
- 	if (IN_PRIVSEP_SE(ctx)) {
- 		make_path(ctx->control_sock, sizeof(ctx->control_sock),
- 		    ifname, family, false);
--		make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock),
-+		make_path(ctx->control_sock_unpriv,
-+		    sizeof(ctx->control_sock_unpriv),
- 		    ifname, family, true);
- 		return 0;
- 	}
--- 
-2.30.0
-
diff --git a/net-misc/drive/Manifest b/net-misc/drive/Manifest
index e5a8c53961de..0c7b035bedc7 100644
--- a/net-misc/drive/Manifest
+++ b/net-misc/drive/Manifest
@@ -1,520 +1,4 @@
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad786a741c1429b44d6764bd9d9ba58139fc5fb88c0264a7e908699ee35667f4e827cbc59733f7fbb8b38837b495d4c23c2d10b1da114 SHA512 b6dd5fa24e928bad836e791a19a0d707c755d6c2b75c8f60f42a9e0410e91034373b01baa61104c24bf1565adade99656948c75be08cec2f945bb8bde91046d3
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod 762 BLAKE2B e6349d349c8249101b89b3fd324ef16b7fcf65dc5a87f751a8738b00619942abd06511247ee0e425b3f9b380a669475061f64cdb27c7c8f8f9007bd6067da13d SHA512 57501aa2452b72ec72fe2fc0cb2e2dc7e53f28895b0a9e829f4bcbf6e87464b9f1d05283f72c066fe7e5665b300112db1b92533affb36db3894ab5dbc04a0cbf
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.zip 1737967 BLAKE2B 4580c9de4f1019942fe55228724d595af0a625e0c8ca6564017b90cc4b24b40c1d330fa6016681790bc99a37ae80212e75e9351d889f17b1f71359b570eb0408 SHA512 f4871321667a46d236720c1009603801adc3c8f9d7545c7b5465e8f41c0762895aec49a3aadd9e3ca3ba6d255cf46feebe39377ccc9d478bf4e145bbbd30b27f
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
-DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
-DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
-DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST drive-0.3.9.1.tar.gz 333217 BLAKE2B 8cc3ef6f22f674ade50c7953812f881a1c5c460c61b39e7f891ed5cd13409051c24c1a864c546643b4b58c632cf5991f72a837f2ff1e6a422d32a300dd58e0be SHA512 5d8f6aaf08ad600915bac4c30626998069d1c6fa676948eb1e03235562dfdf447c0f9f05dbf2c5ffbf6e3e05003b3cee180b9fd28ceb7e83746a52d6640dcfa1
+DIST drive-0.4.0_p20210208-deps.tar.xz 61397376 BLAKE2B ac6352f97e312b71aab714406b0a62e62dc6cdfa66c262cf9c7b2cbaa8027f5b62aabc5d9706e5447199f06fb586257c2efa79c6bbf66e7cb5ac15bf5eb6a4aa SHA512 d65553ba6e6562aa28630020b924149ea6656164b102ff6e4dea0b0d3b89fbd11cb75ce47f5e9d04b5818c407485872828c29981b56176cdebf1c09d6f1fa6cd
 DIST drive-0.4.0_p20210208.tar.gz 353706 BLAKE2B 67af7651e7024109e3b4a64104d89c8ff349ad5cb28e51ccc30cce9c4c4591527c153779cef726522999c9308d461c9fa4340137aa8811ca04501dc80f129434 SHA512 ed34f88ff6fe2c77efe06c53102282bbdcb33fe3a95f275d1755e33172f3cc262a180aa57d50ee5b1a465fa8bcb3e37d34e00aa92a422c8c3e7226c1d3d27774
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
-DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
-DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
-DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
-DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
-DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod 212 BLAKE2B 96a3430ed3030a25f9264f4eadce7424c385a031932829b4975143af2ec4ea64af9119f6cdfe5242b1ac83c5d6f3b577516c36e9ba534e768ba1fe48b907b3dd SHA512 cd34cadb035275e861d1ce0c1abe3c49ed4a1300b3467767f4106cebf001ac36c33a48036ba6135748d887e7bda4a81afeaa70e18e2ac695c53ccc7e0c41d41b
-DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.zip 22029 BLAKE2B f0f24688215047332024efee25710b0fa53492add944cd2b538216e908e1e35f2c1eb7270276afb5fdbe294c5d0b7a6af3f07fa75b2d4d6618d549e6dad06009 SHA512 f6f979061a60ea45d2062e60e7e8e1ffc1ee1ba728c9c4eb71b5a5e4a9bb8a86a8ff71a0d7e885334899699317d02410e08dd30d51f48f1ae52e9423e0c5d6bc
-DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
-DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
-DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
-DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
-DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
-DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod 37 BLAKE2B 2eba24c8176edb0f06c1c186ae603a840629c759182375dab9d574ed3a0b5fd28ba9d329ff01b3fa6bb908b3f50a6a739863cce2b808067d89bcc121edb31e6e SHA512 e31d6cb7f9669adba2a4b79be3af5724ba5807233750bb2273ac1aa4817c58477fffa079775709eb2f93a6c2accf0f1291c663f068b31ec20ebe22b39b6b6249
-DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip 7438 BLAKE2B a70c27d0c79e95186e9d21fee8a4c70011c21c06c1f351d1d02bde12818a3df4b0af98566470a3d39713c8b0d21811af63421944cc39e372d250e512b9dea650 SHA512 c6b9ea0ed6bcc33e0c11e2ef4d8034480f73d89e840f1855130d674f6ff7d462762fec6f5ebd9b61b5155e1ddf18962e18e1b686c3fc7e30870a3acb617df53e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
-DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
-DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
-DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
-DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
-DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
-DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
-DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod 37 BLAKE2B 2ebc74d62cb97bf929cc59df3774562560bc2c1c5e1717380b05fd79f98b1a4396082d62c4992751207915c03c7ea983f8eb91b604d03f628b06d3dc804815dc SHA512 94811e2f653bfc9aa65b2f21212d65e96e0415541152a8607f9ab0d44bc1ab46175f39362cc9c1174aa0b1ea60e00fa977287905096a66a0ecfe62ee75ae1c6d
-DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip 93913 BLAKE2B 083da0dda5ec6e4d8c9bb983caded3c5cd6e723b15f4f9ea8e643d578b171208347a72f34765daeb80551a3c16819bcecf70a9ebc37d3bd587b1ad1f19e50ed0 SHA512 0355660d8521b8853c9449d2fdbc45c3b0243b456fa6fcf627c611c4edbbd7ed8faac5505f464d13b2609c5dc12996332884fdf78b78a2ff7ebf74c8d6184831
-DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
-DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
-DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-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.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.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.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%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
-DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
-DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
-DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
-DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
-DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
-DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
-DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
-DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
-DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
-DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
-DIST github.com%2Fmartini-contrib%2Fbinding%2F@v%2Fv0.0.0-20160701174519-05d3e151b6cf.mod 42 BLAKE2B 91467a3165fc0dfa8984ce7a1be669d9a18faea140c18bf2b5be527ee8b34941629fadc9bd4904e1b673c7c163802ebd63ebe59228756f8daa8c74f8e5ece2de SHA512 eea248164a1e4a4431c1631531d8d0c5b7d5b3b59de204edae1825019b4bbecc134688a89161539a7d074973ee3494c10a8613a4409cc8025c1e4e6088568701
-DIST github.com%2Fmartini-contrib%2Fbinding%2F@v%2Fv0.0.0-20160701174519-05d3e151b6cf.zip 25554 BLAKE2B 3b84406b10eef3c4286a741f982e06a4d51ec8eaafcc1e703320a39500a0f75f0fad29677ee432b38e35dbbc54f21c5f0990936d595182cd7db7b2bab0bf9c97 SHA512 6f16ee999277739cb736722ea6fa1ec2be1857c09e2ceaea425961b9acd4f7eb1495dcd0e9873fe0983858a18ed576ca7c630dac51e71c12393eed03d299ddfb
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
-DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
-DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip 8705 BLAKE2B 905de677e6b1baf15fab1e19177c6f45f7b84aaa1e6426f8aa1c9c77d81b491d4c334ec542d45729e380017a91619b99c8e79451768b1cd9bacdcfb7e9e0981b SHA512 a7983e1a07e1e7fcb047ed7f210cc131c1ac43f4bcb1863c8c17f557e2e2f946624d793e8446632ab127d109ee5d8c1de96f914d6183494ec46145ccd5e75da3
-DIST github.com%2Fodeke-em%2Fcache%2F@v%2Fv0.0.0-20151107100604-baf8e436bc97.mod 33 BLAKE2B e0a3c58082b469e441ec886240da0968b2f37d4b226fdeca0da53fd898c54ce79a6ad0d2122d18df6d074b6caf03ab26447d937bfb6a184c9077beda02b5092d SHA512 c1ee01b237a0c8729419e5424fba1eee5d0a50f569141faad085f06a8c04ae323eff7b6c1816742673a5caf12dc395adb35d4f9672157a2b60df930c9fff7149
-DIST github.com%2Fodeke-em%2Fcache%2F@v%2Fv0.0.0-20151107100604-baf8e436bc97.zip 5476 BLAKE2B 74964bd6ced05d4763418d5ad76c91726c5aaeefce766900b8248b0c3ad6f988f34259d111110a0dbb25c52917fa6e9b866b4ccffe6c0feb390d47fd0a526bcc SHA512 e065209d4126b2a19ba3293e6e376cafbe31c32af7e601e1410fa1a56098d37e5a9f11af323e429e4708ebbd753fac5e57241c82c987e6c930529b00bd5e1f00
-DIST github.com%2Fodeke-em%2Fcli-spinner%2F@v%2Fv0.0.0-20150423150528-610063bb4aee.mod 39 BLAKE2B dda922dd135746990fe902de27101074cb70054e13d184b61bff1ea83619adcb24a0478a61cbd40d20ed07e66d18e3e933b456315c828a8abcd39272e421fd60 SHA512 37658a176a5915ebd31ce13bb8a1ed055afc7e311079629a4547f04040d67279ee18b873c668125e64474b94e529300dfa5dcd18ca3c4f552424436f9e243073
-DIST github.com%2Fodeke-em%2Fcli-spinner%2F@v%2Fv0.0.0-20150423150528-610063bb4aee.zip 3610 BLAKE2B ac4f8552da643f876cd360ac25eb77d0dd78d668880a7972a05b283d3110592b03faea625433cfeb87012105cae637e4562d6c518094a88998e13dabe4b632d9 SHA512 686671f3d7c086a095e81240fd4cd288ca5e6ba3b10b3df836aa1be458818ea23a9e44e87f6df8239b4680e336009ff1ece98959e594f30ae30aca32781d407d
-DIST github.com%2Fodeke-em%2Fcommand%2F@v%2Fv0.0.0-20151021022416-91ca5ec5e9a1.mod 35 BLAKE2B bdc57fb2814cc2c2402d1bdad23901cd6831ebe6888a21cef96eb264c47a2262965be750fd552fda30cd4acaefb58ea7b34a0aa92580ce6cbd6e8186acda9d7b SHA512 6a1a5c46408f93d888462b583c3a715968b17dbf19a107aec1f81075eadba299b25fd4dd7959afa753679c6f770a07dd55fe193d88e63f96e8fa7160a7a99fb5
-DIST github.com%2Fodeke-em%2Fcommand%2F@v%2Fv0.0.0-20151021022416-91ca5ec5e9a1.zip 5772 BLAKE2B 60e3ed73413d596f17bb158375796c714ca9cec7c1c479521302cf7d0b0840f1a37457ffb27f62fa8171f33cc9dbd7226cda341f55acb078e8034551b38f233d SHA512 d8802e51840ac0029f9d25c6bdd36be167c84c5325c411b99bf30d3ac93be5cb0c9dcd70f87cecee0b94e6f5e6f35ffc3084c2f663b164cb890eaf7c2c901bdc
-DIST github.com%2Fodeke-em%2Fexponential-backoff%2F@v%2Fv0.0.0-20150606110550-96e25d36ae36.mod 47 BLAKE2B 645236ff5c157ecee21cd9440db55d1937b808cd94aa97cfb1606ddb9d6796566b2ea1ba113330a6b1d4a7991a798120be8a09710eeff88d2a69644776775ce3 SHA512 edfbfc46854a899bd0cd9274d46e5e1268bc9c593752bebd191ab3bda39303367f34bf3e57ead8559242b30bce263ed980dc5b65f9290d0e129521df3a5a9ab6
-DIST github.com%2Fodeke-em%2Fexponential-backoff%2F@v%2Fv0.0.0-20150606110550-96e25d36ae36.zip 3628 BLAKE2B 80172e17b110ecbe6eb4ae4fd7538c6979f64f9611db58e3dfd81d886a859861203e1ded2297fb04838ddc32850e1c779b514c67d40185d4848d7bfec580f065 SHA512 b47a370e0adabb19ad941d526f2b182e42e908599ccbb0f983353c8e933bb3878fa4ab68323c2c2b532125e6baa266e0a9c24312373925dd7e0f61b62dad3a46
-DIST github.com%2Fodeke-em%2Fextractor%2F@v%2Fv0.0.0-20150727035912-801861aedb85.mod 37 BLAKE2B c0ff760415c716fc8c620cc56575ebb710de8eed9340af7a6aa3d0392c635fd3462aa6b863cc1b78924f6c6d5eb19c3cff33dab54791a8bd41d0fe1af783a4c6 SHA512 86d228c053a9e91161f4bd3cdb097907714435a175309618ab7fbf88284d9228e74febd6c8c1e8d5cafdd03de97c5e0b4ff4243f915f1e5b2e9dc5306ea4cfe5
-DIST github.com%2Fodeke-em%2Fextractor%2F@v%2Fv0.0.0-20150727035912-801861aedb85.zip 2705 BLAKE2B 270b86273c2a0b43b6bc618ef3854cecea5cd706b4d88e5f869c98d7bf94ef3df82a1a5c74c86dc5249dfe2e22fc5ac2b17a417461c40bedef950ced775614af SHA512 94164727d4d58e1f8e0d26a4816f645c19894777be5569987d97cfe945d72828e66e15ec4657502e42fe5b8d080c63f3fdfc6fbfe8e746cc27fe91f40e60e0d1
-DIST github.com%2Fodeke-em%2Fgo-utils%2F@v%2Fv0.0.0-20170224015737-e8ebaed0777a.mod 36 BLAKE2B 22b4f10011ca1a3ed3c0b48a2c1f6cfedd60d92fcb10272befe0fe1be390c0db22cb0089d688fbac74c8a71e69efc80c01f2794ab72987b508c0fd83fde018ce SHA512 cbf1fbdde872430c15142e84c9a0c8fcaca4a64a504cb40018db6e17a722a3f921c1ed12f96f42aee760a2758ccf216be96725830804fe0fe7e5826966e6ba46
-DIST github.com%2Fodeke-em%2Fgo-utils%2F@v%2Fv0.0.0-20170224015737-e8ebaed0777a.zip 11441 BLAKE2B 9e2ddfb89f24c69f884c4318cf48e627fe99bb339cd39aad142f8d67e47934c39103710f87653311efa6911aeb47e4b8c272347932a790af236ddeaf4dc033a5 SHA512 50afa7966eda6ba0e04bcd0ac13b68e1b57b269eff88b0890fc51bf355783c2afd42b1a8fd29bd79c0abce52680f14771018bc3107c6dd6f142dcb5a8e1e3ed9
-DIST github.com%2Fodeke-em%2Fgo-uuid%2F@v%2Fv0.0.0-20151221120446-b211d769a9aa.mod 35 BLAKE2B b924b274c12044ae74c7927515d42fe8883ca2d0a662e04ec95a13a07c4e93d732cf1eb56bbf2d77762bb67c0d1c4aa6f5b232cf8ac44a7b8ed4974fa43a53b8 SHA512 0811507868b5f497aee6b64808d7d56918e75079ec88e61e72f4a22d788c9bea747ecb5dfeb5be4a7ee965e9dc5a14d8c5bb71f5707f317f38c210f0fe9d8eac
-DIST github.com%2Fodeke-em%2Fgo-uuid%2F@v%2Fv0.0.0-20151221120446-b211d769a9aa.zip 17588 BLAKE2B 1c1dfc552f8f3ca8afd2215574f0336569a1fbe7e06672c4ef1be874bb49dd9fabbc80f204af983c4c92ab5a4b67f946bb2d944a70a6623c64bf8c39ad74b63a SHA512 d62702acd6d39e2c03837ea9ff2632e2cec4626dfcf5744fb89ce6192f2690498b895ce8bbe47e393ab91462effa599a9c59198fb24aae13f341e3ee62501082
-DIST github.com%2Fodeke-em%2Flog%2F@v%2Fv0.0.0-20170107003526-8d60a6917853.mod 31 BLAKE2B cb4ef8c9d79c9e3c43151997612c0fe151220fb7c984ada4e9a8f2998ad154cbf2be49ca9bfe2d2c9e50f32f5143f522824c66b13a97947047574aa97dee45ff SHA512 684f47f72b05bdc6422bb8ff5c8c2057e389b90678c3381a5be9be066e10dd346731dfdcb595a260d743a0cb3b8c47c58df6aa47378974fc3d4f6a20b0a7a448
-DIST github.com%2Fodeke-em%2Flog%2F@v%2Fv0.0.0-20170107003526-8d60a6917853.zip 3315 BLAKE2B 3624dd1ede22afe9cb5c4f8658a072f271b9c9079bf7fc55dc56fba8b32aef859ca5eec8e05881aa4060fe252d915452e386fcb52a82f00116baeb87ee43b4ef SHA512 92b71c7403d30f6b793460130f1b67cd3da7c71b1a701d27c78a3c8ab14b3e83aaeccb1616ea6c848e57979fcc3777a56e40c9e874932a610545a310d552325e
-DIST github.com%2Fodeke-em%2Fmeddler%2F@v%2Fv0.0.0-20151019050616-d2b51d2b40e7.mod 35 BLAKE2B 4ba5f130cf5a1871003c9dabe25c56007f37f6d9c5c0c1f91163a7816260bd69d7c00ade242c279c6c98241e2521166cdec074956f51e335baed71db9da20d48 SHA512 4d9ed21fa91040c2687a6e7ac450ab255237724f07a2c65c9805d4d0c9979bec9e18668a921c0139800903b3b61528eb36f62a6ad7c27d277f7f52232a1494f2
-DIST github.com%2Fodeke-em%2Fmeddler%2F@v%2Fv0.0.0-20151019050616-d2b51d2b40e7.zip 2660 BLAKE2B 049ed1bc2fb52802fdc97f62e9c0ba8fc0380421b53214b4ea5c4483248398d7bdfe92f7b119226db4534dc587be9e5dac22db955cd8edf29704bd9de6ce207a SHA512 1e4390b027bf0293070ad55f2e8c5f024ec43c867904836c1e7635cf5e9e3ac686220dbf00588fe960b3e36cb82473130fc727b4028f4ec2fce6a681ccde889e
-DIST github.com%2Fodeke-em%2Fnamespace%2F@v%2Fv0.0.0-20161218061609-0ab79ba44f13.mod 37 BLAKE2B 640f1aa87f80c03a21d2340e4d5a1e43ea53de1d9edb31985b3bb6d45f4ebf8c899e5d83278314dc780ea9099d3ef312082bad0c85b472615bd2f8c6d28bcd75 SHA512 d9433ad9848bab566e29e4b9889a43f673ed9350a6317e53c30c4d27c613d25e88ea6b7e2cdd3c73eb100520138e45c74e6270e0b4ec478074b1e572d09fa21a
-DIST github.com%2Fodeke-em%2Fnamespace%2F@v%2Fv0.0.0-20161218061609-0ab79ba44f13.zip 3830 BLAKE2B d0925c61c8f4e3183dd066f76cff7096dd2f28b2a69d8d2089138d8e14b5ebe2be538e3a32958bd0dd5f38797db56d1314e31ed3d0ee731c57b15d80b4e9e475 SHA512 d5c3d6eeb79fa7206f1d4fe16d77079406da8d85f9d3376ea1b6bf66636ff597ba9ed28dcae0881b72809d6c479f01987f6f6838b7026ef3ae7a7a28dfd5f767
-DIST github.com%2Fodeke-em%2Fpretty-words%2F@v%2Fv0.0.0-20151007025238-9d37a7fcb4ae.mod 40 BLAKE2B bdff86150cd43f92259b6306f43d0ee57e40e95b45809ec66ce546aeafc4a0aa8ec1333ecff2a394ce1c9cc84d6c943532f373a1c5f791a51e337c91508e6106 SHA512 5d59bd7938807b53ab44e7d7db8776842569b95afd7843b2996ca5f50da5e19bc765f654fe06044c5c374592d10c083b8612f3ad03a6ada5e9d08ca6a40640c4
-DIST github.com%2Fodeke-em%2Fpretty-words%2F@v%2Fv0.0.0-20151007025238-9d37a7fcb4ae.zip 3764 BLAKE2B 580999353b180f3be9656a7ce5502d1c8faadf2b5c9c60aa91072a7b3805c78ae37b28e9c7595cfe45df10d622d06671f497edbf90a11ac6233f391eda43dd7f SHA512 2275d35129f630ab005832b8c46353e0a2257630bc561d164192909a7efaf3617ba822ac064c4e5802fd7257a58ddcebf2acd2056eb047a2a580ea4cb339efb9
-DIST github.com%2Fodeke-em%2Fripper%2F@v%2Fv0.0.0-20150415060325-bd1a682568fc.mod 34 BLAKE2B 8ec7998339df2bf7c1065c349df88c1abaa1999741863a215356ca83f2964ea6e003e6c03cc90316d7c4c158516f440a8207beb01b6b928e9446ada2e900b56a SHA512 b5ce888dbbe7111f6a38c937bd2e09736c39883a28ceb38d60bb0522ec57af91c46f2631c977d8e3a88185acd281197724ae6ca7e82e20383d119811ec3d1815
-DIST github.com%2Fodeke-em%2Fripper%2F@v%2Fv0.0.0-20150415060325-bd1a682568fc.zip 8528 BLAKE2B a98cbd1037303aebfb917e6dbb873fad2ac63c40f1e02d613cfb2abc2d73c9a65443995a9dba1fd4929eefc01973dcfaa76950b6705aa335493d1f4fa46deb00 SHA512 4ce79101b100b1879729ada99f00274d7c2d99971b225ee75eff41bc9d3cd76235f92f0c51ff98eea589171392820078aae79627c901941d46d99c53b1716a72
-DIST github.com%2Fodeke-em%2Fsemalim%2F@v%2Fv0.0.0-20151225075036-9c88bf5f9156.mod 35 BLAKE2B d2926835a8d67f079ef7ae077a5e785ac601f3a59f5a2d234df47339e52aadb45f8c9102406f2edeada794f4018286ec9f8e3b950a56f656f6f295ed78d155e5 SHA512 340f2a8e50a48dab1fc497050c2a63dbcb6fd374b1fbb4b71331018fc29f6d0219ad29c59db9bb3e7537cb9264377db1532d1440a9e7a4cc618319c7974c1f7e
-DIST github.com%2Fodeke-em%2Fsemalim%2F@v%2Fv0.0.0-20151225075036-9c88bf5f9156.zip 4431 BLAKE2B bdce265751bf0e450a00f5f03bdf080c7f25c8e3da440910fac05a962845e8b4b962d0ddcfdab5ee1d769406a7c72e97a22834aed9306a1bc41654e5ff730782 SHA512 93f8dd0d447f1d56c69dd1d4a332d9ec23930f8ab0fc904b4f79ece4df61a4ed44b6bf4b1be77b608f86d4370d5cc4bf6ba90bf2b5e3bd79493cdad360241563
-DIST github.com%2Fodeke-em%2Fstatos%2F@v%2Fv0.0.0-20161104082728-292960a201e2.mod 34 BLAKE2B 769de0fba4eba931592682be4bd1e27340e819a3e37c9fb8c5ce3fd35a9fc387f900727e1402ffea6fe8bd3238a0d994cf6bc565e660517b13ac8ce4b247cb78 SHA512 0fb930910686a838edd96f9c90b5e3b51c9b09873f8b879d3cecd1486d9f427fea42dfbb12fd0e51d696679afa09300986d93d76ce20913eac9bbe36b30a848e
-DIST github.com%2Fodeke-em%2Fstatos%2F@v%2Fv0.0.0-20161104082728-292960a201e2.zip 5431 BLAKE2B 20407709e43544dc0a569e956046436c075587acc9e3b8075aefc7b0aff32ac8d0cf37fa42cd57d4e11abfaf0c79aad82cceb1e2edd5828a78ed03c6e5efae55 SHA512 d4a395c933e622b3938b9ef559f455e4ed80828af99faba82d9669e9b30b10897e9333324d3e8fc47b200ca71574813f76a3302cf6b6a2c4b926308ff0409852
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6
-DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.mod 41 BLAKE2B da40259a83c14d444c933f97bb673c4edee72b95d5c19ef021479afe2ebfb6f01bc157527214a19e35d100a6f4d353eeefc60badf51cb85dcd735a773aa5b033 SHA512 7a7b948320e1df47d23498732e5fd7e63fcd7e905299e11f74ee86a8146fe8df29dfea06abd59185810d75c7ff670e2ecba07ccc461b681a9469beafcfb7801b
-DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.zip 10942 BLAKE2B 4a005718197a71d02645058b05709d48b8fa5b47abd6b09510e49f2ccebd4df64e44c2384738620df78ea9374916526df8c32b3a57862d27c781546bdee1d15d SHA512 c6c281f254babe495259203720ee46fc6a5efdaec50d2504781289d7ca6358cdcac6cff4ce2556d505926bb8f9a352ac55caa5a8389fb5c15a2de5d2919cf24a
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com-GoogleCloudPlatform-gcloud-golang-a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9.tar.gz 846769 BLAKE2B 0e9ba48fb3d5d026eee52642ab8f04df2b23bef28ef7d2c04ceb7f634ecd6325038572994966fa6273c174c430291dca4d83914791765ea45ce24cbc49752260 SHA512 85bf289a4daea998bbcdfc7c4da9539305c4847f005b5f180ca5f056288d6c6b1f4cee88ce7e91d594358b0dfec2f5cc8e0c9e0c9d436ff199fb217c7b86f835
-DIST github.com-boltdb-bolt-fa5367d20c994db73282594be0146ab221657943.tar.gz 83957 BLAKE2B 14c29a394454944dde249bc4a135395f4382500557aeae3d2ad63500acb0271c7cf41fcdbc2463fc73918f7cfc7cd8fdcbc573bef9a4ae17b150d8064a1b6da3 SHA512 d877c68da702a5bd0cbec5d7f7c2d2f6d58e1fe1dd0071b095d1ba1d12e5a9844e53dbef7d4855e56852e4669c976dc0705358ad8ee5466e49cc4a2a5ca5202a
-DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 83950 BLAKE2B 04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd SHA512 5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
-DIST github.com-census-instrumentation-opencensus-go-65310139a05de5c10077b75ac45eac743aa01214.tar.gz 160417 BLAKE2B f3279539f4ef60d5e895ba4813e082684bda0e9311fdb47439d01c2f07159858cd458078c588ee5d9115b08a1703489ebd5f9d31838a821afe29e0c3d340ebe6 SHA512 ae1a05f0d2938bb55d2f66be48c92b3717b4c0c29246736a26a87aa14cca50254b5e29801be9b4e3e53bf7a331be6d984eaf40ecd5e5e13b6f8d72febfba9a66
-DIST github.com-cheggaaa-pb-657164d0228d6bebe316fdf725c69f131a50fb10.tar.gz 11372 BLAKE2B 1b4b4094b1891fed8d3bd57bb062495cca1241868c9a127b9fc99b906b9b5454bb6e39a0e8d63e0ea443d45c76c5e1ded792c246c9b24c07a5deccb93ed82b79 SHA512 ef1d88b9cc4c939841680fa2a6ecc02de55c7c954224491ea9bba4c13c9c70e8c8a66524c748557b96b8998196f21c2fd712720a717a8e349f0e97d5ce9943c1
-DIST github.com-cheggaaa-pb-ca06a0216aa3e3429a8b9667219931c48417bced.tar.gz 29243 BLAKE2B 41effb6e4b048145a3a18c905394ef1fea11a93de7b4b1fb0cb146c3aeba766a0d9c2f41bfd88196fe50d78772d482a1ef6d9fab9cd84504120a81d2ef035b10 SHA512 e8c3dfb8087e5bf8c11cf6a839873537f6f4c2674f14de129940d40ecf77be5a12cbf2d5a6fb87d7e01a6dacd8ad06d1128da0933a2e4b9ae60209bd0722f6db
-DIST github.com-codegangsta-inject-33e0aa1cb7c019ccc3fbe049a8262a6403d30504.tar.gz 5059 BLAKE2B 52219f8424bfcaa4f4dfc2b68e38dd1be378ed05040457cc21bab932c4a509664c37d312394272577199acd416ff82c024ceb005dff3b94e410b653425ac75dd SHA512 f6c062c41587e998020099888c370c5ece39a664c014bd809ad57533191dca5aa46d00cbe438588abb6f24d7275c3a3c86c7a6d37f9928fd530e1724741b2c1e
-DIST github.com-go-martini-martini-22fa46961aabd2665cf3f1343b146d20028f5071.tar.gz 66063 BLAKE2B 51fc1044718d0490d6af675ac173a9f1ecb73f336996dbb8c84f313d5ee549dda8941e77e5e915c567a1584987a79ddf0cf7ea1d771f4e5df75ccac92d80bd01 SHA512 f5b01ccd3045df4e3cfa92ae31540754f50fc5b29850341d6df3afb6db41cafdd3a0e0b4b78fce9361c7069b6ce6926270604565b8fec028c0a6b1911171585a
-DIST github.com-golang-crypto-227b76d455e791cb042b03e633e2f7fbcfdf74a5.tar.gz 1693346 BLAKE2B 70921e8cba675b687cc389777f1d264959aa8896606e294afb65a4f42b0600005e08fc1e55c30d78b4b3a32b7a02b963c81eb7196331c5d070b7340abf340b76 SHA512 108fe3b650756ea7218377dabe19f112980271f0a26f4260de6b420b38ad298d8b305c7c77203242f02c544ea352c7d3d5d47465f38b9ccc664828a0a90bd2d4
-DIST github.com-golang-crypto-faadfbdc035307d901e69eea569f5dda451a3ee3.tar.gz 1432695 BLAKE2B 2cfee911a611bb463007ed5709371fa68e673defe4af2500cefc1d2e8c04e94f725b7970275b192ed473e19e01629f5ea928867e396e0666d965073f9a3d9fce SHA512 dc11930e69b5552559b8fb906bd6cd302468d397f4d43087f215ea2afc74aa4ab014a532d6005b0f4cf600887da51acc4584333077334204351200bfecb44adc
-DIST github.com-golang-groupcache-869f871628b6baa9cfbc11732cdf6546b17c1298.tar.gz 26038 BLAKE2B 154828b6d5f8be97ee9b462a766834e36f8012e7e15a8d7d30f0a5a8a3d1773aeb9b103b3dd1470f7553fb5a5ddff52860565dc6d47f0c49af608309d1be67b2 SHA512 0245e645d9cdca84f8413d58f507a9bdcd8b047784aed2a9175cf31ecdd9de19a088afdd28a1079200fd13ad1ba6f647d29ba54bbeff10811af8cccdd0bc2837
-DIST github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz 920336 BLAKE2B 4a80a4cbf866ff64c699860bef3a971b6ba6bc002e85106e2268b494f40b8a87c61f923c70818e4dc59bf898986393a8c8e972c50152a3abc48545d780ee5474 SHA512 49ccb64c9b675460d12ea6d0456bb1124a92d56e70b04398d14b33dd5879c4e188dcc3e6c79c1aa6f491507f854911a9298fbc61aed60cbdab0205b6995bb4a3
-DIST github.com-golang-net-a8b05e9114ab0cb08faec337c959aed24b68bf50.tar.gz 1100877 BLAKE2B 38c1463616a78757114cb5b860a77859dee25a2cecfeb0185495c444bcc9338b491bc61c71263df3cbbf9490cc4852aed7c0af6114e96c118410e805c3e45ce7 SHA512 b6f5c3d5082b7005080a4d4c61bd45cf986afb0a64aa2a625466206a964805b78c1c1070150bab6b7234abdf5b4b52d64f4563e8265009ecfcd8849ebdf9ed05
-DIST github.com-golang-oauth2-0f29369cfe4552d0e4bcddc57cc75f4d7e672a33.tar.gz 45476 BLAKE2B 42a97cfb38a2633d99e5995b75f055a6ae5bc3f34b3a501fd4b016c129a0e85fdf1412f5f8e5614ccaf19b1abf018e3b5da7339c9c796ed9d2bb40c25ee477fb SHA512 f7b55b531c924bcdae71beeae0191b0ba002a7551012e8a6e1c088fc74dc4c985353af362138fa9276eb5d965f25b45b3c87c8e1a756d8c0e89893816b825661
-DIST github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz 38610 BLAKE2B d966e904199bbaa5a566e1d042e6bcc29d91aa9ef812bff3d5f01dac69a51542d6a5cc8b68bdb7d7e986977a47b67d030014447d4b8a893a8ee07713db37abfd SHA512 9301e42d43ff421f85949b1fd7e60baa183842b0d128c0f4895708c30a91e4e614032a08dda03c2564b41251037c453f95aa21fe1876672e033c83890a96d660
-DIST github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz 267933 BLAKE2B be018eea3f65b35bea4f4d92c973370dfbdcb85151df40df7976ff6ea0186f90a62e42444f9e6e562a8615333f2798aafcaf40b9226861a5bb9f8844ee3dcd4e SHA512 7b6ac268d15fc5e2c07a22784565466abca6257deef90183bab45e1935c915dbebe5560e6583d76b2ba8b58fa22b0c07f5f512c188b6503ebbf47937f844afe9
-DIST github.com-golang-protobuf-822fe56949f5d56c9e2f02367c657e0e9b4d27d1.tar.gz 312851 BLAKE2B 059908a4117b73cf97c4d25ac31dc6b1a220df61fcb5f9ac89b12030cb20dec1f0bb38bdce594126182ecddefa9cba7759e91aee11096e5044317c83ec78f714 SHA512 2d08221f87e8f1b66e1899cde7e1ac05aea37529facf265868c3c88f6b4432b6fee03fc91a4b7220a88bafe58eab05105f8d466803e852807cacc13f6765a02e
-DIST github.com-golang-sys-b4ddaad3f8a36719f2b8bc6486c14cc468ca2bb5.tar.gz 1475029 BLAKE2B a5af729102365be07894b2b9c355f98a40f95968a6774175186ee629c847e2d97fec79b8d5668094d84dba1568b5c171d100157a262f5e86d00c5162ad01ca55 SHA512 0fa28c91ae4f284db7828ea35b4d5507a5599c4cd19ed9e7017592d13b05327205ea32febcabdea22460e4bd55566fac3a1ad1f7d1a66f2a532388c370bb70d3
-DIST github.com-golang-text-14c0d48ead0cd47e3104ada247d91be04afc7a5a.tar.gz 4618483 BLAKE2B c627b2edbf87e88e89bb7bf3f93a4e96cbc2fdacbcc2133dd747273f11814030feb687b80b6a540f02f6c3e1b067888c704fea306505913ea717d5cc5a70069b SHA512 3878ad8e044c46bb005b245ea2d23cfd3dc3810a0c93a70eb12a04705deb0342223a250e9466c3e407504cbe3514917f0d1b50873c0375c945688b8869ba5f9d
-DIST github.com-golang-text-3d0f7978add91030e5e8976ff65ccdd828286cba.tar.gz 7167109 BLAKE2B e436d8cd5a5a1e87b050e129b7d0cac07ee6b20eccc947c1c1ea7cbb2aa6ac356350ea2cd5e32c72eda2c5f47c579c52bd99b03aae8642685a4d95844e9e9c10 SHA512 d295eda8a620e279ffbb173792489283f1ee428c83a6969ef01952e492d5010d0e38206b6566b13c7d221ed4793fd426a2b01b041b2a23656c88610b3a4def5e
-DIST github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz 988349 BLAKE2B aee32d0d4139172442699412756f6429944b8ef2389e539d1717c4962642e3b63e3d725c28cc4c15189b4b1f286c7c93aee3fe190054b757b2362dea1463b925 SHA512 1cfcc16d9eb8d6414e943d7a62ea6606527b34135e8baa905f92e1e4f438f245d9cc4db9711c9b191b979bab6eef404adb84c2c85fd2af2c91bc0d8e89a7b1cf
-DIST github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz 6388385 BLAKE2B 32a0337f4d105742571f76919f15e1c99df19c5bd9999e70dbf02e85713905ff8daecd80d51cebeba76d1af0757868929c502529a97fc7a983983555258c4ee7 SHA512 5d5d66abff2bad1a758e0a9cd9b12b9d9d2f02df8b9eb6ff0b38ae505808c1a6e78eb46ee0516b92ab04e1241aac827287b2dc050adf84c867168e0b441864ba
-DIST github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz 6194 BLAKE2B 1989ec7d4037c79b9bff29517e710003c52930e43f80f6c3afffa88a97ae4dffa073122326b7544cef3e86d72025707a5f888e6df0d934bb629078fa7aaaa821 SHA512 880d9a46a9ed3814546049f50b71824f9b59bd89dfc8c8d0d2710a69eef5036f70a553495c72783d9d8336d05a6caf89bcecc2be2f5ad2667d1380d4ad8ac2e3
-DIST github.com-googleapis-gax-go-7cb21a99a18735dde62f5d3cc0244f3f35bd9515.tar.gz 14417 BLAKE2B 80dbb6603214ae778fcb1e6582a4c0fe26575fa28f8763068a9b1128a95305182a6f1bda154e340018023c859b846b5e2f25706b0bffe8c38e2deebb025a239d SHA512 e10b1dff53617f64fca7afe206f129b3bec4be6c86f9cc49877d918800174d0fa5f14eb406ae2a5e129737a622669e74d8b5d7f151bcac175896ccb00523ea71
-DIST github.com-googleapis-go-genproto-f660b865573183437d2d868f703fe88bb8af0b55.tar.gz 5446313 BLAKE2B 2ff837abb3d06d442cd2dd457502ac4c80e606c8b39f772cbc1012434ecfc03fd8e4ec91e830ca8296dfb9ac6b04333f8ea145510c3c18e93ab8aca4c340524b SHA512 e2c2a975352726d306885c33a0233307e911901da3764aae67395a754569a21c2a26ec493cb429776c8c758b95269839ae4c8f9f7fe86e80a0c45550c165d023
-DIST github.com-googleapis-google-api-go-client-634b73c1f50be990f1ba97c3f325fb7f88b13775.tar.gz 12246570 BLAKE2B 432ab16fb03f7914ec868e6739f8d88d07759124bf18aab3cd1b3a90381f22486a5fe663748734597d19364fa40d54517703180465b0b3b99e0bd5927c3052d0 SHA512 6559b7d49b4cb3bf52dee7cdcbe7a9c8280485258d97be19e59bfa7b7c7f0ab90877f5e3fb5fddd233ceccb92f5b3182566ede956301f4a26ee10f9bf8749ee3
-DIST github.com-googleapis-google-cloud-go-ce902a9872e454f175f5e84ceae12514cd33953f.tar.gz 2290706 BLAKE2B 4bab420a1c69629494a3f0befb6f8fb41de5b9b32aebed5be58006fe2227bfd83d388b38ea91b26ec30e302631dccad3651ee14224643ac6476697f34ef551de SHA512 e676d7667c52f75286d52a19eaac873e21f0081bd849140b779eb4b868e072037eba2797bc7798995de60eaeed5bdb79fad485c82ae38dfb542fd48254602129
-DIST github.com-grpc-grpc-go-bb78878767b96d411e740439ac820f118e95ae2f.tar.gz 315770 BLAKE2B 346a0195b46220cd0309417e64c5fa0c473570ecfdd5de0aa22c8f24385186b206ff5038b102928201972d627f5bebcc93899e539f8d3b64811faefd11a0de5c SHA512 9c54f853ca37d0493f17a2532b8d6f4c4a445fb26aa96f9220ab3abf92b00143233c4c38784dda4dbcf02fb181aa2bae6b37f29eaa45f5ae97ee5510f9115a9f
-DIST github.com-grpc-grpc-go-e2cfd1c28f4a49333263cf65123aae57b081750b.tar.gz 755225 BLAKE2B e9121d18f80ddd79c4f1125e8f175f7d8753e126a799e0d49b0e2d62e376ea5cd43fd227b6c3ff60a044bd31a43d1d9032f231c4b75c14ef435a266d30c7f024 SHA512 6c58a0cc54eec91dca18e9e7efd03bd106e37260d9c4515764bd295aba75bd1150a9d3d66e7df598fac7dd73006ef4d2ed41628484c362fa63bf836450ab6218
-DIST github.com-martini-contrib-binding-05d3e151b6cf34dacac6306226a33db68459a3b5.tar.gz 16976 BLAKE2B d23b52cc1591e65e9bc685d10000e5f17952418c11e2bcf0ce8e3ea4083daadbc3a111ac93d0a8d7e739b9567d4a1898e99f1e9c641af8a19d54700fa19c474a SHA512 c53c61cc3904d9c5c25a3d1b22bb3651242e89f2975c783a60edd25ae387d51dd5566624dd030d1b4697ab09b99f828a628e917e8079e27356e9971ac2e1c028
-DIST github.com-mattn-go-isatty-bf9a1dea1961e1d831824fb135332bfb8c10e8b8.tar.gz 4313 BLAKE2B c7e6a555b5430913d497c49f4b27893f30c297a2fc7f57418a6ca0d834b2a0f13d25139eb9d2cdd8ba4bc63958f656f759058b3a64be52385ad8fca8dce0789b SHA512 cf0f3e672782ede02e6ed5d6e646b25c0db6e2b15fce60b7242c7606324fea3b0105f9a2d0e766e656f8bcc8d168678e603878ffff38098d7b1c736dbbf8dfa5
-DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 BLAKE2B 6b64f8ae69fdd8beb3cb783a80bfc827af3797903065de3bc3253c90fbf0a2b706c3a5bd63560b19d765d6a9e0b19413436a9f999ac3c483075e9431e0971eab SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9
-DIST github.com-mattn-go-runewidth-703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211.tar.gz 19903 BLAKE2B 03718136abfcb4f076d42f018e61556ed57060ed114b3a9e711f7265bc9adf349f3b2f888a24a3f4ec45c9a85258b7baf6b08243bf1b9a2991f2bb3fc9b482fe SHA512 2add2c422ce926792aed92e130e9dd3e58cc8aa93aa8e66715146e35d789deed76a0c0fa6b7b6755dbabf63eab20a374b380c073b90e8a2a85ae719193e1747a
-DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
-DIST github.com-odeke-em-cache-baf8e436bc97557118cb0bf118ab8ac6aeeda381.tar.gz 3525 BLAKE2B e3c919432a9b3b084e36a6d7f77447a2a1e35e22c13a05f020abed5c84f91a48716d79950d00393922dcd88d1e1259fef9c75c43a34c384dcecc8e81263365df SHA512 547f5923824fe422bb3bc6240dd7bc2c13fa499352c168ba69bc650549e4f39e5f52cfd0ab30fc86221bebe600401e72a530b3365575e40e9d0e72b1f83bd522
-DIST github.com-odeke-em-cli-spinner-610063bb4aeef25f7645b3e6080456655ec0fb33.tar.gz 2376 BLAKE2B 24a933e09d4c749561bb8f670dfc5dab88f99432a16d3fbf47d594438ec3433275e2ab3a3a1a16fdb27ef5eed38d4210e1684575c93bc0bb2b5709c9ca7d83fc SHA512 91dcf9cf1634691685c091a78609cc6cbd87b4bc9677092bb4d078cb3680b75dec131444e0afe813dc35f5703a164029a77497482b44e11f7d88ee976d73ed26
-DIST github.com-odeke-em-command-91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561.tar.gz 4078 BLAKE2B 2ce74955b0bd6c0d15dd98c0c61e3ab760651b9caa8bf9da147a86f6b15227f50c153a13df2a2fdd6876409632fb05af38276fd41481f23f85665d3bf3bc4c66 SHA512 2efb78236313bd0ddc82f7322f752e0b0bf351e8bcd1f1643efeeec7185ba1757a34d6c640b89429b60bae29cffe0ee093b0af7e63861deab38ee5feaf5bb73a
-DIST github.com-odeke-em-exponential-backoff-96e25d36ae36ad09ac02cbfe653b44c4043a8e09.tar.gz 2188 BLAKE2B f9bccd4996529187c3339f383924ac39aeee47b03583c250a80cce81dc7991e3728dc0658403b9d0a2690904cea6fed420cdce64241796c5dc4e9bb343811b1d SHA512 3bca870fc1e2b9920442ac8672f937e6a346ec5794e3acbd831b01d287e1bcc7c9cbbf1996766369e2ee65e886aced2e1a6d3274818d7b69b6ed13cbf4e5595e
-DIST github.com-odeke-em-extractor-801861aedb854c7ac5e1329e9713023e9dc2b4d4.tar.gz 1750 BLAKE2B a93c4e60a74db245c595e3de52a407ff070c59809a4fc9d3753c8049ae2f14c47e43f75398680563938afb04325d3f82863f8aeb0964cded92cba87c18a2b5be SHA512 6cc47a2aa73357e6a6ca1f0fd0ae5750db1efe9f0eb966b654b670b14f672bf872310dd633a5530d8d0bc05c745f401ad2f3985e477706bb012b5477f2975856
-DIST github.com-odeke-em-go-utils-e8ebaed0777a55fa09937617a157dd51386136c2.tar.gz 6256 BLAKE2B fb5543f1b02f69f75f58a50925947721c4ed3578c5f1483bb8e075308dac9e0d6534dcbf0784e0271fd5a08b98684770cb14443dab2c94cacb1ac276991ededf SHA512 c0497264181b42a7b794b913c863a84e2b0d44659db3ed27fbb073c48f875c57a418e2350d43c759397697ee5d5db566bf427705eadfe7bde48828bc69456df8
-DIST github.com-odeke-em-go-uuid-b211d769a9aaba5b2b8bdbab5de3c227116f3c39.tar.gz 10400 BLAKE2B dac628ffd9e8d2579c0674c2872ef2125ddc86489199e994efe188f4dbec0b33b2a3abfa58753b0f4ff954576543792af4e108009a993131c5d4de8f1ff97c71 SHA512 e8b53aa2ee88cea20052091eb6b7022dcb5bc1a2d1ef342b18468c2ea53a3c43c64941f57fc777244ab72bb105d061de1f255d257b044d048fbae3044d93e528
-DIST github.com-odeke-em-log-8d60a6917853243fd746612e6ba47843a794fa82.tar.gz 2426 BLAKE2B 475645ba7dd46a19b5fa0ee989fca86f34b3323b4b33e4b7f28d416a9ce51df8eac17ae4aa04c70d9555d62feb1c062ffd22b261289f8aab286ae01eae7caee6 SHA512 de24de185b05d448a37d9b38a415ed8f47757ba0b12171d0bac217a040f3b43d31716ae351194c89c289855cd61d37be38887419c14c584de8686555bb4be675
-DIST github.com-odeke-em-meddler-d2b51d2b40e786ab5f810d85e65b96404cf33570.tar.gz 1972 BLAKE2B d2bc1667b18ac7ee98d053542b6d025d0415955bc2ba33e1dae57ef6eccb26c73f91c4dabc6ec874c49284adc0f43018b98dfee02fbd21c7211a7fbceb75c252 SHA512 7d27ab87bc97994d053f4396fe4419c74afbab210e7f7d172472779263ff2878fa0d8bd5eb242167403e53d40b66683bc3c19fc83f5b8f374e12273d58949630
-DIST github.com-odeke-em-namespace-0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6.tar.gz 2825 BLAKE2B e30a0bdd8817f53116ba5cb8375dc3cb8a40e654ee93c4919d6ca5c71ffffc9c42a36350708ce52ebd712cf5f8e6032c60cbd12a015401085b7e82ee77c0a78b SHA512 d22d4f561d5278211957203e27faeb29234f9d103757aed8413386c3b9b2e4bbd210cade9511c6f4168a6c615fa637f36639c9d6b3f161836611a40db30994b5
-DIST github.com-odeke-em-pretty-words-9d37a7fcb4ae6f94b288d371938482994458cecb.tar.gz 2377 BLAKE2B ace1fe3cc0239a5e7798851e501cc0643244db398a31dfbe913e5de2ab8eb52131e8c30ddc98d4788d330f114b92d1c0558b0aabfb1df2706d8c90500cd9cf7f SHA512 e5dffef8840aafe77302f33dd4c22489df6a3f15850cf05bc9adb052bad1f449be972703543a610303a19b355730109d98be35d4397dc2c1751e560fe16bac5c
-DIST github.com-odeke-em-rsc-6ad75e1e26192f3d140b6486deb99c9dbd289846.tar.gz 2130311 BLAKE2B 363705a46ffe45949ab256ddda12b97831a159871beca3fa2be656797d599fb3af6aaa561337f569db31f791b4163947886b628d4e430b54567f7625857c1765 SHA512 220162a67229ddc1b234b3b6e4fc446c834b8c08348dcbb3d3a71767c7099c5b77d46c01d5cb91ca83745686ec66fd8184ad3eea300e4db63b89c1557568acba
-DIST github.com-odeke-em-semalim-9c88bf5f9156ed06ec5110a705d41b8580fd96f7.tar.gz 2742 BLAKE2B c29a6584d9d651391383cf3f004fec29721f658ad50451fc06186c59dec3944ef6b2bcc8457abc7d214832f3b108a86a29ced5e60520f2a657e8bd5fb64d4e95 SHA512 f2d6ae78d017f7603dd6a7737803bf3633dad1abb029a069001fd4d8af63fa52220f8c3942433970e4d9e68fa3ca7be7945d68fa84b99f599164eca88d81cb29
-DIST github.com-odeke-em-statos-292960a201e2310a667eac7796f4e11cd51021a3.tar.gz 2874 BLAKE2B 9f06fd0f687162a69f9c62e47a4edb37115282f52d32a43ed6ea425891530e6a3b6032b40a93b28b48d7fb6143e594162df42847779a961e1e5d07f1358bbdea SHA512 359fbdc4f03ce7477c5dd08a7ea6892193fa0ea976497cfa5e5e8bc3b8ac57c7a479b02b6d54e615842c4ab8d3f4d369b865408654cb18b2ccac2511e87ccdd8
-DIST github.com-skratchdot-open-golang-75fb7ed4208cf72d323d7d02fd1a5964a7a9073c.tar.gz 7012 BLAKE2B 9eb3ac6232df0c2ef5921bc0c7f160635a44ea01732b7858b5edd0d4c0bd06679c16097311ed0180d20d321c2a676c3c18179a277ffdeaaa2190dfcc8a3f61f7 SHA512 c9255b599d6f743c00bb0acd7f6b3c3078c34b2dfb1c30dc2f8a4e4f4c466efb2115749d0b0ab8595c925efc8e67f9e769ab6183d1676743f279289e8c5b3744
-DIST github.com-skratchdot-open-golang-79abb63cd66e41cb1473e26d11ebdcd68b04c8e5.tar.gz 7073 BLAKE2B 6960cad397a1f82e3d6ff183b3e4cce1d99a21fde9d0cf3f089e911dd9c5f7b35e825fab5a13660805a6725b1b00593e018be1bb161514f90425a12e1da41c68 SHA512 3a0c5539931dd8e9f459c9f3758682ab7f4c5bd5f134dcd6e5e176e0536ce81d58d46950f5ac91165e247b635ad199c02efa6fa8820a30802b8b7ea15d12d8e8
-DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
-DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
-DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.5.mod 478 BLAKE2B aa63f336c10d04557c0f24301afc55f32d5d9062c70a03307bf7b5b7626e7f2125be07c7b6900cec97e1af9429d4930bac4d67179d87575e90acaf68d7fc3ffe SHA512 e94311fef653435875bf2c670a9c19e0e1fa2d6761b9323115504d2acb154596818d5ec9d4f65c662e607f4089cbbb6be0cfef0bb41631260ff8474c759c1323
-DIST go.opencensus.io%2F@v%2Fv0.22.5.zip 304246 BLAKE2B e0fec87affb4467ce127e62d6e86dd371bd32d4b8a7193e5c3cc39f306e289f67f3026b43930a23b60f6c42367f29c28a0d31a146cf19c13a79fed0e961af9b6 SHA512 905c4a03641b7978a06132f43f9fb2402ef4fdbea7438ca8e8524e48a142c0ff00656abc9857c7bf64bf0de159e7d3f972c3dac1cdf7f608afd3ba7506b8518b
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-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-20201217014255-9d1352758620.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201217014255-9d1352758620.zip 1864836 BLAKE2B c331a603ac81675e360574e3d7f199f749b260e414b70fd80bca0319cbdfe18e6e2c37240912cb4d23a8781f23c6103a2201e1e895e64c740c664e5061b88c50 SHA512 7958f77c6dd8df0cb4b6ff71fc6f9b77e03d3a5e071016680893dcfa988598f9cb45ab5af36ac9f5d8345e843b8a02ba2f5793a4f818040ca881a0adf60acbc7
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
-DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
-DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
-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
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
-DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
-DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
-DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
-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.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
-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.1.1-0.20191107180719-034126e5016b.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%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.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-20200222125558-5a598a2470a0.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-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.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
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.zip 1583477 BLAKE2B d962b57eb9ab20a1924ff5fee8d1fcc699b7b5359688f118c89692a6ebe94d6ea2f9ecd895c4a7412fa0cbe22da0bc75f4da599d40724163c71d8208a3bfccc7 SHA512 1b55d167b50ed2c0e35fba56e774d9a2df6ab884f0f576a7a46f5b9daa891c8846ffce7828ee5af1247fd458bc8b9bfc8ca554b9a0f7ca945f73268ea1862a55
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.zip 103831 BLAKE2B ccd6bfab9e9992c5f7f086bae06ffcd35764cf5b1ff392146045409ed51d2db6ffd8970051bab3d788a06dadb2d0d10b6b6df049661e993f0d195b20b2de3b47 SHA512 f0ffe4460113bad0f9bb79c86691a68e0c77e08af3680b07304585f4b7b311d5e8378250031a18182a2310af99ded8363f35bbcd8458a5fec86063ba0b0fd7ae
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-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-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.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%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-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-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip 1529486 BLAKE2B 3d16c77453863e514e36d22712e3673efa29d8bc2e2db1fc09aacd0a18d476b2129b209ad6920342501f3a9b82c1e13a9887da70c96a43cf5bda6edf40ead76e SHA512 ddc7c95d0a5a188838bfced4e2f29da4984789b5a60c3ee6d496ade59b3089567d7f6eddb35ffdf3fbb90cae8ccc3f95ae7c2976f5b39320060ce591e8ff5b38
-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.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-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-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
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-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-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod 270 BLAKE2B a160bf39c4d5efcdab43134808910d37ca9029684c921d91d4dea4e264bf24b592db0f063029f1c0b50e6dc8e1822394503b7acba305a82330371bf9cb5f2017 SHA512 9124d96cde52e0dee04886ef164f35a03a7c05b11398d3667cf0d28f84aac0bb5b44a0f52343033d62886ff62728cbdfa045e5f865c1d96203844f3986f95957
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
-DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
-DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
-DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
-DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
-DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
-DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
-DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
-DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
-DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
-DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
-DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod 582 BLAKE2B cc82a660be4095a67922226ab37e8331301128d10332fe60fab27f17e1556b90031bf0c11dd53401fb0805632711296b561c1a7526d93545eaccb92c3ca5506a SHA512 930fb5295538f738db5258811eb8cb03e35f916a882cf271ef5175f0ea0d8fe905d040f5974b34cc9594b008f03fa7f4653ef7bcf5160d8498e18af0bc54d9af
-DIST google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod 582 BLAKE2B 9551c78d14cf644fc943fc5fd7446eb42482bcb793f5f20db40e61f44178a306ce9aa8d49fddc9e36fff3cd0874d4c7b84b2a2a2139f32e915c938f9c6cd5af5 SHA512 936dc2fb686660be7aa7982ff5b224ac0dabb22d3bceb27287453a8dff62d846b81316588db4f7cbbd9bd172faee0eea6f2a55a8bf0e0ccc7af6414808ca4c02
-DIST google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod 582 BLAKE2B c48eded2a495e3b15d0e72fe82347bf3ea517ee9fc06011b1f3b7a634fab445fdabc88391b802cb0d2376bf322c9dbdb135c2125ac8a95f4f225cd16a1e5aff5 SHA512 7182d531a7ead6167213f15a305e853f1c8cfc92189f4390a0572c735b7c1100584b7572b7b1fe44eb5539ac846a3e5fc66bc2f2c841e5110ee9ae5e5886c063
-DIST google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod 582 BLAKE2B 6144aaa4d8f028d41ecbc807a0286e1d703bbd248c2741c117d78e380c3d84c004a2f7552899c3fd7f241441b8931db63c904b4e8d81e860c5236d921074402a SHA512 a80b81fe93766e995ce621dd5459b203f694e7b4fefbfcd06ff7f75a07c31d23b4575c9d1947ad570efa969083d120f7bdcfecaacd8a386efedad7c740088f69
-DIST google.golang.org%2Fapi%2F@v%2Fv0.36.0.zip 18625897 BLAKE2B e7b8830bf5afe18cfb37306a8bfcab1145a7bbf93028482b81d525395be95ce04050d0c09aa5366d7aba9b8574bc3b8ff87b6d5f52151c2a47cc4e9a2157555b SHA512 42444e77a374ff825ddc9be57d20c33c3a9384ba32ca38fafc2b790d6ed7b00a3229aaae4a4ca31325476927f37b107021aa60a24a4706d7d532a0d5296c4946
-DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
-DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
-DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
-DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip 417823 BLAKE2B 3ba5afeec03711fd1e2ecb11739fcc4dd770d5f1c23489549c7b3697fd7bb8eb8471fa76569a73b7ad4a2b634a126a055e1d67ab654e399005398655f0bf8a31 SHA512 cb047087045fe995e28b96c1a3ea3cef8b46facfcca80fdc14707f4f09d1429daeca9cbc456ecd9bb2e3d32dde145b75929506b10ffd67d35b3604674dc27b01
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.zip 8795922 BLAKE2B 27403e2effea6ebe77b5d0f537d45791d77b3c277d96846b6f4e180f723048c471d518f7995302afd09b36f4116c2e3d14200a9701fbe80c7895d7044a839bcd SHA512 5b5b3241643e2acf306ad0d114c5b16dc374d9a7edae70a63ec0c0d2b9d8e52dd4cd9ab49c48f1154c31cb5a7ad4a39a789e1d84d62a3317153a7b14a6ae9944
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod 578 BLAKE2B db5963bd3e0da1108af3ae72d613cc24fbe23c0569e137ff8c4ba94e393b2b574612e0133a263e8a264cf781469983363a8f147a7f0d9e0f21ed4831772565a0 SHA512 3c04e477a21db637ce07078cb89ad236db3151ca0fe474eab32c326e7e849b41abfa873045d2214bc95e34ebec7767a68f9d5a9828ef286abb4636a14677c479
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip 1360328 BLAKE2B 09032b3d1e7204f83d1a7d74f636e45d7dccf773e962a63d58cfc505315e20697acaba7e374f2b03ef5f31f37dd81acb28397c5ec3fdf5750061cd9c4aed34fd SHA512 3f70e3a88f9688fe1d17c7851809051a35d3556204ca7664ceb440f96715db284cd5b5fb62b95aa69a11c3835679aff5566e838954bbb73a6a760143504eb2f9
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-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-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
-DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
-DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
-DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
-DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
-EBUILD drive-0.3.9.1-r1.ebuild 3480 BLAKE2B f6ec9551faf9e8d09f882e5cb4cf1cd9411d26f030dcea78536f66aed1bade03931cfe7099b2356f08aa1b283c0315a38102c7131c15fa84fea63dae74ad5bfe SHA512 16306a233e2807fd71fccce0b28c782c21054471aa00a8a88f1d441bbe69231ed7e2f1691e848b29eb9c11df9830644fa8a27086098dfb674fd4e8292e1a7b2d
-EBUILD drive-0.3.9.1.ebuild 3213 BLAKE2B 80e7ed458b801144eff5282b544b24a4e701dd525490639a9b5baa794674bbba62e90d601d5e5af0243239d33c6c3325e40eadb6bc2bfff110518e524a60dfb9 SHA512 54465d167153b6f99e2784526ce3b71524248d123a71cdc363c882b0c4d951b1a47dae6d0276e4f536d5640bcf3844547473835b74b1f8bfbd3af470a42c024f
-EBUILD drive-0.4.0_p20210208.ebuild 26690 BLAKE2B 1e7d9a895c7d73f047eb812c1dc56172160b7b497272edab0155b8166df5987db274b31dd0266d4497b2f97d9d00e1e6589b83c2f3360139c8ba1578f6ada703 SHA512 e390760a379a8e390081ce620298a28bafc37deac3bd0bc6d2109d83d36f114cd63a807e9f4252606552bf87ac465b57b800ac2b16ddea4f19a904b13c74abaf
+EBUILD drive-0.4.0_p20210208.ebuild 871 BLAKE2B 3c7671e671fb0f9376c45041df95ee38180a81976e7b00a2a85a08cfa780dd97bef4cf22c6336cf63fb1d2b82edd115db80f830d811c6eb9fbaf04fd5c3e18e0 SHA512 bf16b6b491a70bac0643cbb9522325030eb9d4c262020d4041e392e48e5305650941b3732d3adbbffd7478801bdbb27b1def33bed2e08adfa9d1d1b8c3275a08
 MISC metadata.xml 324 BLAKE2B 26ffdb6c654e3e4078c8eb7c28a66f5e081b1ea23c5dbce35dc933a8ace8d58c9b273c1c0f0b0af24e2370afcff00311bc8d1c7af3faa5bfd3b8e3cb11f5b25e SHA512 07e07223942945915df006bb9bf24cdfa735a3d1f49fbf606a445435a55b98d292a25a39fc62d24f05b3e926d3d7f36141bd1f7293a3ebacaf9587ea8b15bfe9
diff --git a/net-misc/drive/drive-0.3.9.1-r1.ebuild b/net-misc/drive/drive-0.3.9.1-r1.ebuild
deleted file mode 100644
index b1fe7886e7ab..000000000000
--- a/net-misc/drive/drive-0.3.9.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-DESCRIPTION="Google Drive client for the commandline"
-HOMEPAGE="https://github.com/odeke-em/drive"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-EGO_VENDOR=(
-	"cloud.google.com/go ce902a9872e454f175f5e84ceae12514cd33953f github.com/googleapis/google-cloud-go"
-	"github.com/boltdb/bolt fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5"
-	"github.com/cheggaaa/pb ca06a0216aa3e3429a8b9667219931c48417bced"
-	"github.com/codegangsta/inject 33e0aa1cb7c019ccc3fbe049a8262a6403d30504"
-	"github.com/golang/groupcache 869f871628b6baa9cfbc11732cdf6546b17c1298"
-	"github.com/golang/protobuf 822fe56949f5d56c9e2f02367c657e0e9b4d27d1"
-	"github.com/go-martini/martini 22fa46961aabd2665cf3f1343b146d20028f5071"
-	"github.com/googleapis/gax-go 7cb21a99a18735dde62f5d3cc0244f3f35bd9515"
-	"github.com/martini-contrib/binding 05d3e151b6cf34dacac6306226a33db68459a3b5"
-	"github.com/mattn/go-isatty bf9a1dea1961e1d831824fb135332bfb8c10e8b8"
-	"github.com/mattn/go-runewidth 703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"
-	"github.com/odeke-em/cache baf8e436bc97557118cb0bf118ab8ac6aeeda381"
-	"github.com/odeke-em/cli-spinner 610063bb4aeef25f7645b3e6080456655ec0fb33"
-	"github.com/odeke-em/command 91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"
-	"github.com/odeke-em/exponential-backoff 96e25d36ae36ad09ac02cbfe653b44c4043a8e09"
-	"github.com/odeke-em/extractor 801861aedb854c7ac5e1329e9713023e9dc2b4d4"
-	"github.com/odeke-em/go-utils e8ebaed0777a55fa09937617a157dd51386136c2"
-	"github.com/odeke-em/go-uuid b211d769a9aaba5b2b8bdbab5de3c227116f3c39"
-	"github.com/odeke-em/log 8d60a6917853243fd746612e6ba47843a794fa82"
-	"github.com/odeke-em/meddler d2b51d2b40e786ab5f810d85e65b96404cf33570"
-	"github.com/odeke-em/namespace 0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6"
-	"github.com/odeke-em/pretty-words 9d37a7fcb4ae6f94b288d371938482994458cecb"
-	"github.com/odeke-em/rsc 6ad75e1e26192f3d140b6486deb99c9dbd289846"
-	"github.com/odeke-em/semalim 9c88bf5f9156ed06ec5110a705d41b8580fd96f7"
-	"github.com/odeke-em/statos 292960a201e2310a667eac7796f4e11cd51021a3"
-	"github.com/skratchdot/open-golang 79abb63cd66e41cb1473e26d11ebdcd68b04c8e5"
-	"golang.org/x/crypto 227b76d455e791cb042b03e633e2f7fbcfdf74a5 github.com/golang/crypto"
-	"golang.org/x/net a8b05e9114ab0cb08faec337c959aed24b68bf50 github.com/golang/net"
-	"golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33 github.com/golang/oauth2"
-	"golang.org/x/sys b4ddaad3f8a36719f2b8bc6486c14cc468ca2bb5 github.com/golang/sys"
-	"golang.org/x/text 3d0f7978add91030e5e8976ff65ccdd828286cba github.com/golang/text"
-	"google.golang.org/api 634b73c1f50be990f1ba97c3f325fb7f88b13775 github.com/googleapis/google-api-go-client"
-	"google.golang.org/genproto f660b865573183437d2d868f703fe88bb8af0b55 github.com/googleapis/go-genproto"
-	"google.golang.org/grpc e2cfd1c28f4a49333263cf65123aae57b081750b github.com/grpc/grpc-go"
-	"go.opencensus.io 65310139a05de5c10077b75ac45eac743aa01214 github.com/census-instrumentation/opencensus-go"
-)
-inherit golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} \
-		"${EGO_PN}"/{cmd/drive,drive-server} || die
-}
-
-src_install() {
-	dodoc "${S}/src/${EGO_PN}/README.md"
-	dobin "${S}/bin/drive"{,-server}
-}
diff --git a/net-misc/drive/drive-0.3.9.1.ebuild b/net-misc/drive/drive-0.3.9.1.ebuild
deleted file mode 100644
index 8ddfbb9f66f5..000000000000
--- a/net-misc/drive/drive-0.3.9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="amd64"
-DESCRIPTION="Google Drive client for the commandline"
-HOMEPAGE="https://github.com/odeke-em/drive"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-EGO_VENDOR=(
-	"cloud.google.com/go a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9 github.com/GoogleCloudPlatform/gcloud-golang"
-	"github.com/boltdb/bolt fa5367d20c994db73282594be0146ab221657943"
-	"github.com/cheggaaa/pb 657164d0228d6bebe316fdf725c69f131a50fb10"
-	"github.com/codegangsta/inject 33e0aa1cb7c019ccc3fbe049a8262a6403d30504"
-	"github.com/go-martini/martini 22fa46961aabd2665cf3f1343b146d20028f5071"
-	"github.com/golang/protobuf 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8"
-	"github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e083ff0b9622f"
-	"github.com/martini-contrib/binding 05d3e151b6cf34dacac6306226a33db68459a3b5"
-	"github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
-	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-	"github.com/odeke-em/cache baf8e436bc97557118cb0bf118ab8ac6aeeda381"
-	"github.com/odeke-em/cli-spinner 610063bb4aeef25f7645b3e6080456655ec0fb33"
-	"github.com/odeke-em/command 91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"
-	"github.com/odeke-em/exponential-backoff 96e25d36ae36ad09ac02cbfe653b44c4043a8e09"
-	"github.com/odeke-em/extractor 801861aedb854c7ac5e1329e9713023e9dc2b4d4"
-	"github.com/odeke-em/go-utils e8ebaed0777a55fa09937617a157dd51386136c2"
-	"github.com/odeke-em/go-uuid b211d769a9aaba5b2b8bdbab5de3c227116f3c39"
-	"github.com/odeke-em/log 8d60a6917853243fd746612e6ba47843a794fa82"
-	"github.com/odeke-em/meddler d2b51d2b40e786ab5f810d85e65b96404cf33570"
-	"github.com/odeke-em/namespace 0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6"
-	"github.com/odeke-em/pretty-words 9d37a7fcb4ae6f94b288d371938482994458cecb"
-	"github.com/odeke-em/rsc 6ad75e1e26192f3d140b6486deb99c9dbd289846"
-	"github.com/odeke-em/semalim 9c88bf5f9156ed06ec5110a705d41b8580fd96f7"
-	"github.com/odeke-em/statos 292960a201e2310a667eac7796f4e11cd51021a3"
-	"github.com/skratchdot/open-golang 75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"
-	"golang.org/x/crypto faadfbdc035307d901e69eea569f5dda451a3ee3 github.com/golang/crypto"
-	"golang.org/x/net 859d1a86bb617c0c20d154590c3c5d3fcb670b07 github.com/golang/net"
-	"golang.org/x/oauth2 13449ad91cb26cb47661c1b080790392170385fd github.com/golang/oauth2"
-	"golang.org/x/text 14c0d48ead0cd47e3104ada247d91be04afc7a5a github.com/golang/text"
-	"google.golang.org/api 39c3dd417c5a443607650f18e829ad308da08dd2 github.com/google/google-api-go-client"
-	"google.golang.org/genproto 595979c8a7bf586b2d293fb42246bf91a0b893d9 github.com/google/go-genproto"
-	"google.golang.org/grpc bb78878767b96d411e740439ac820f118e95ae2f github.com/grpc/grpc-go"
-)
-inherit golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} \
-		"${EGO_PN}"/{cmd/drive,drive-server} || die
-}
-
-src_install() {
-	dodoc "${S}/src/${EGO_PN}/README.md"
-	dobin "${S}/bin/drive"{,-server}
-}
diff --git a/net-misc/drive/drive-0.4.0_p20210208.ebuild b/net-misc/drive/drive-0.4.0_p20210208.ebuild
index 0c3afc3d4bfa..0e830cdd3de4 100644
--- a/net-misc/drive/drive-0.4.0_p20210208.ebuild
+++ b/net-misc/drive/drive-0.4.0_p20210208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,478 +8,10 @@ inherit go-module
 DESCRIPTION="Google Drive client for the commandline"
 HOMEPAGE="https://github.com/odeke-em/drive"
 EGIT_COMMIT="bede608f250a9333d55c43396fc5e72827e806fd"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0/go.mod"
-"cloud.google.com/go v0.44.1/go.mod"
-"cloud.google.com/go v0.44.2/go.mod"
-"cloud.google.com/go v0.45.1/go.mod"
-"cloud.google.com/go v0.46.3/go.mod"
-"cloud.google.com/go v0.50.0/go.mod"
-"cloud.google.com/go v0.52.0/go.mod"
-"cloud.google.com/go v0.53.0/go.mod"
-"cloud.google.com/go v0.54.0/go.mod"
-"cloud.google.com/go v0.56.0/go.mod"
-"cloud.google.com/go v0.57.0/go.mod"
-"cloud.google.com/go v0.62.0/go.mod"
-"cloud.google.com/go v0.65.0/go.mod"
-"cloud.google.com/go v0.72.0"
-"cloud.google.com/go v0.72.0/go.mod"
-"cloud.google.com/go/bigquery v1.0.1/go.mod"
-"cloud.google.com/go/bigquery v1.3.0/go.mod"
-"cloud.google.com/go/bigquery v1.4.0/go.mod"
-"cloud.google.com/go/bigquery v1.5.0/go.mod"
-"cloud.google.com/go/bigquery v1.7.0/go.mod"
-"cloud.google.com/go/bigquery v1.8.0/go.mod"
-"cloud.google.com/go/datastore v1.0.0/go.mod"
-"cloud.google.com/go/datastore v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.0.1/go.mod"
-"cloud.google.com/go/pubsub v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.2.0/go.mod"
-"cloud.google.com/go/pubsub v1.3.1/go.mod"
-"cloud.google.com/go/storage v1.0.0/go.mod"
-"cloud.google.com/go/storage v1.5.0/go.mod"
-"cloud.google.com/go/storage v1.6.0/go.mod"
-"cloud.google.com/go/storage v1.8.0/go.mod"
-"cloud.google.com/go/storage v1.10.0/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cheggaaa/pb v1.0.29"
-"github.com/cheggaaa/pb v1.0.29/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
-"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/fatih/color v1.9.0"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
-"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/mock v1.3.1/go.mod"
-"github.com/golang/mock v1.4.0/go.mod"
-"github.com/golang/mock v1.4.1/go.mod"
-"github.com/golang/mock v1.4.3/go.mod"
-"github.com/golang/mock v1.4.4/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.3/go.mod"
-"github.com/golang/protobuf v1.3.4/go.mod"
-"github.com/golang/protobuf v1.3.5/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.1/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/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"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.4.1/go.mod"
-"github.com/google/go-cmp v0.5.0/go.mod"
-"github.com/google/go-cmp v0.5.1/go.mod"
-"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/martian v2.1.0+incompatible/go.mod"
-"github.com/google/martian/v3 v3.0.0/go.mod"
-"github.com/google/martian/v3 v3.1.0/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
-"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
-"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/uuid v1.1.2/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/martini-contrib/binding v0.0.0-20160701174519-05d3e151b6cf"
-"github.com/martini-contrib/binding v0.0.0-20160701174519-05d3e151b6cf/go.mod"
-"github.com/mattn/go-colorable v0.1.4"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-isatty v0.0.8/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.4"
-"github.com/mattn/go-runewidth v0.0.4/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/odeke-em/cache v0.0.0-20151107100604-baf8e436bc97"
-"github.com/odeke-em/cache v0.0.0-20151107100604-baf8e436bc97/go.mod"
-"github.com/odeke-em/cli-spinner v0.0.0-20150423150528-610063bb4aee"
-"github.com/odeke-em/cli-spinner v0.0.0-20150423150528-610063bb4aee/go.mod"
-"github.com/odeke-em/command v0.0.0-20151021022416-91ca5ec5e9a1"
-"github.com/odeke-em/command v0.0.0-20151021022416-91ca5ec5e9a1/go.mod"
-"github.com/odeke-em/exponential-backoff v0.0.0-20150606110550-96e25d36ae36"
-"github.com/odeke-em/exponential-backoff v0.0.0-20150606110550-96e25d36ae36/go.mod"
-"github.com/odeke-em/extractor v0.0.0-20150727035912-801861aedb85"
-"github.com/odeke-em/extractor v0.0.0-20150727035912-801861aedb85/go.mod"
-"github.com/odeke-em/go-utils v0.0.0-20170224015737-e8ebaed0777a"
-"github.com/odeke-em/go-utils v0.0.0-20170224015737-e8ebaed0777a/go.mod"
-"github.com/odeke-em/go-uuid v0.0.0-20151221120446-b211d769a9aa"
-"github.com/odeke-em/go-uuid v0.0.0-20151221120446-b211d769a9aa/go.mod"
-"github.com/odeke-em/log v0.0.0-20170107003526-8d60a6917853"
-"github.com/odeke-em/log v0.0.0-20170107003526-8d60a6917853/go.mod"
-"github.com/odeke-em/meddler v0.0.0-20151019050616-d2b51d2b40e7"
-"github.com/odeke-em/meddler v0.0.0-20151019050616-d2b51d2b40e7/go.mod"
-"github.com/odeke-em/namespace v0.0.0-20161218061609-0ab79ba44f13"
-"github.com/odeke-em/namespace v0.0.0-20161218061609-0ab79ba44f13/go.mod"
-"github.com/odeke-em/pretty-words v0.0.0-20151007025238-9d37a7fcb4ae"
-"github.com/odeke-em/pretty-words v0.0.0-20151007025238-9d37a7fcb4ae/go.mod"
-"github.com/odeke-em/ripper v0.0.0-20150415060325-bd1a682568fc"
-"github.com/odeke-em/ripper v0.0.0-20150415060325-bd1a682568fc/go.mod"
-"github.com/odeke-em/semalim v0.0.0-20151225075036-9c88bf5f9156"
-"github.com/odeke-em/semalim v0.0.0-20151225075036-9c88bf5f9156/go.mod"
-"github.com/odeke-em/statos v0.0.0-20161104082728-292960a201e2"
-"github.com/odeke-em/statos v0.0.0-20161104082728-292960a201e2/go.mod"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
-"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
-"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966"
-"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/yuin/goldmark v1.1.25/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.1.32/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0/go.mod"
-"go.opencensus.io v0.22.2/go.mod"
-"go.opencensus.io v0.22.3/go.mod"
-"go.opencensus.io v0.22.4/go.mod"
-"go.opencensus.io v0.22.5"
-"go.opencensus.io v0.22.5/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-20190605123033-f99c8df09eb5/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/crypto v0.0.0-20201217014255-9d1352758620"
-"golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.0/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"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-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
-"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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-20200222125558-5a598a2470a0/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
-"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
-"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
-"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/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-20200822124328-c89045814202/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/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/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
-"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
-"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5"
-"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/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-20200317015054-43a5402ce75a/go.mod"
-"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/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-20200331124033-c3d80250170d/go.mod"
-"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
-"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
-"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
-"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
-"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
-"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/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.0.0-20170915032832-14c0d48ead0c/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.4"
-"golang.org/x/text v0.3.4/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/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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-20190312151545-0bb0c0a6e846/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
-"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
-"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
-"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
-"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
-"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
-"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
-"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
-"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
-"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
-"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
-"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
-"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
-"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.7.0/go.mod"
-"google.golang.org/api v0.8.0/go.mod"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/api v0.13.0/go.mod"
-"google.golang.org/api v0.14.0/go.mod"
-"google.golang.org/api v0.15.0/go.mod"
-"google.golang.org/api v0.17.0/go.mod"
-"google.golang.org/api v0.18.0/go.mod"
-"google.golang.org/api v0.19.0/go.mod"
-"google.golang.org/api v0.20.0/go.mod"
-"google.golang.org/api v0.22.0/go.mod"
-"google.golang.org/api v0.24.0/go.mod"
-"google.golang.org/api v0.28.0/go.mod"
-"google.golang.org/api v0.29.0/go.mod"
-"google.golang.org/api v0.30.0/go.mod"
-"google.golang.org/api v0.35.0/go.mod"
-"google.golang.org/api v0.36.0"
-"google.golang.org/api v0.36.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.1/go.mod"
-"google.golang.org/appengine v1.6.5/go.mod"
-"google.golang.org/appengine v1.6.6/go.mod"
-"google.golang.org/appengine v1.6.7"
-"google.golang.org/appengine v1.6.7/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
-"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
-"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
-"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
-"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
-"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
-"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
-"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
-"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
-"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
-"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
-"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e"
-"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.1/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.25.1/go.mod"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/grpc v1.27.0/go.mod"
-"google.golang.org/grpc v1.27.1/go.mod"
-"google.golang.org/grpc v1.28.0/go.mod"
-"google.golang.org/grpc v1.29.1/go.mod"
-"google.golang.org/grpc v1.30.0/go.mod"
-"google.golang.org/grpc v1.31.0/go.mod"
-"google.golang.org/grpc v1.31.1/go.mod"
-"google.golang.org/grpc v1.33.2"
-"google.golang.org/grpc v1.33.2/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/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.24.0/go.mod"
-"google.golang.org/protobuf v1.25.0"
-"google.golang.org/protobuf v1.25.0/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/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
-"rsc.io/binaryregexp v0.2.0/go.mod"
-"rsc.io/quote/v3 v3.1.0/go.mod"
-"rsc.io/sampler v1.3.0/go.mod"
-)
-go-module_set_globals
-
 SRC_URI="https://github.com/odeke-em/drive/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
+	https://dev.gentoo.org/~zmedico/dist/drive-0.4.0_p20210208-deps.tar.xz"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE=""
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 409409853faa..b2cf052cd916 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,4 +1,4 @@
 AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c181a73e10a1d065b046e4a35db5a10270f55a6805d52f985be75766bdb56516ea787fd71f72609285455de9e85f2 SHA512 b54e326267ab5de72820be006ec02a0bb33286e6e577165cf0ad3ae3015bcd6f568f99a9866299b7ab64519907baa61a611514be067adaab3e11484d83d576df
-DIST dropbox-cli-2020.03.04.py.xz 14304 BLAKE2B 600378cbacd6e96c16e1c8464261b260f2d8919ef5f361c4f337386d3849294cf8557d44f1c5d4f5682eadb2f15885a16b0a8fa162929665e518801d23ec35cc SHA512 c6c8f2f3fb08818388f5ac812821a1530214ad18d58191b08092852aa953e2947871145b46a4df4debeb629a870e1182a47fd5a8bdf8b22144e686e19ede689a
-EBUILD dropbox-cli-2020.03.04-r1.ebuild 719 BLAKE2B 4076d2c4d03df26eba5bfe9cbcf7bc63502fb7ff27699080486c0ad1b47f87c763db3623e8ea29f8d93635332ffaf258e0227476393c5e3075792fb53a339ea1 SHA512 463eb1ef0ab8619f9b064d2167c0a1ec366e813c11ce73315cb236d73c25972aaf4180d67ba58602e32e0e1311ec4ac1a71b0401bf278045e26ea10189df8702
-MISC metadata.xml 218 BLAKE2B 4b5a9c75179f8636715ac2ad60ff4df17ff65610cd464c640d621cbbdbfe74c92764094f5764e5f81dda3df95ebbadbe34ef34182f596ac8049e410cfc217a88 SHA512 ddabd8078f316fd0d1639886703177da070b797544b89142630d7249ba79aade39ee679367edade378b6fa19ca4ab8752e9655bab81ac16030ee4876b966ef0e
+DIST dropbox-cli-2022.py.xz 14288 BLAKE2B a90d347efcce5917179853afef346a6679dddbb33e146a936786c226ad519601f503d73eeb1d1e205be8bd11792aeedb90ff7046c770f079a47e75dea80efd99 SHA512 59bfbf3544a8407bbc232d87e57d8b27d4bbc108483af52e58c0badddde6ce2dfde2203403a8c5e8c95421fe8c4b73e75cec64def2699ae9bac31be965e98974
+EBUILD dropbox-cli-2022.ebuild 720 BLAKE2B ce42b902f7e0afc0bbc81b0d12194110c2ec5ef3ef5d291d94a97736e975823a5dd899cacb5ad8470eac5c9b8919cbfcfba02bd6e0ea9c29e8cd382b3888fd92 SHA512 d7a5d27f3ca1fa20e6507528abfa0795423167dadd6354240a4b9f6d2cfa515a0798a87e1e90c8d6e10bbf9a230172670313bdfbb1dd1e80a03ca679f097db38
+MISC metadata.xml 311 BLAKE2B ff3b8e2e3f7b28ac858933b5cb5dda2eb2c56621c5fa07d0adc571066d598ecc97cdf114425d3c3cb5f4d49df8ce88a79b16f4f17ee462cc98ffeb9b9dba4d62 SHA512 774123d6db311ce59f6aeeb930364d3341156a0236b2606e10dac09ddb8604cb2e323c308213a39446bc8abeeaf61617162bff808cda282f441a6a8df671de4f
diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-2022.ebuild
index 44de1f5f0fb6..926b2f7cba5e 100644
--- a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-2022.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-r1 bash-completion-r1
 
@@ -14,12 +14,12 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="+gpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="net-misc/dropbox
 	${PYTHON_DEPS}
-	dev-python/pygpgme[${PYTHON_USEDEP}]
+	gpg? ( app-crypt/gpgme[python] )
 	dev-python/pygobject:3[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}
diff --git a/net-misc/dropbox-cli/metadata.xml b/net-misc/dropbox-cli/metadata.xml
index c5941bf7de12..1f35bc0d6b20 100644
--- a/net-misc/dropbox-cli/metadata.xml
+++ b/net-misc/dropbox-cli/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>grozin@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> to verify signatures</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 495973189f21..9a07298e58d3 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,10 +2,10 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-147.4.4800.tar.gz 102214911 BLAKE2B a35086b6787cf442a326d1f6a3e6bd1d453a6d76817ece33f9a43d6d35182b20c343eafded7a6023b37267fc2c3b99896e28f7913ed18f5541fe107b0235cbe9 SHA512 16b40b080ce0b97d0d3da86543a31f07331d27ec42dcf0c06a3632c4e5448ea11f4e2471f3796729de20d13af4bfbc0bf65ae1993eb592f0b170ab44fa441b62
-DIST dropbox-lnx.x86-148.4.4519.tar.gz 103388037 BLAKE2B 5bc5a7a211dd5d4bfa12070bfcac061fa5ecfce39a7390e945a00ac3e440d5aa82633581538cffe6525dd7d55dbaa68a00648b8e62c6545a395cc6810e0e7d01 SHA512 a063e2d3f6d2edc01df9ff40dfefbfef9e42decd8b1088605cab6a1482f73b75908a4350c3053fa05e0c9cf62dd44dbb319cdce8b882bcde6f738255e366c0e5
-DIST dropbox-lnx.x86_64-147.4.4800.tar.gz 104476319 BLAKE2B 0bb282285df72bed5da4134b22500f0d3ee649d0b7902c3016288914bf331c40e6704fcbde7de21215ca93500f559f32fb503025f2d18832962650ad85ce6e74 SHA512 f54d083d901f0cb2ab53e5fc735f4fd69eb9bce87b5177c2ef9ba54913bab1d286ccd57f7ae13bc09b8dc7482a4209fc9ad792c9f74d550487daee311319c247
-DIST dropbox-lnx.x86_64-148.4.4519.tar.gz 105252627 BLAKE2B 923412d600c34daa248be2179a8c8d09b097bec9a9efb68bd9df5a8d68e0702336ef35f4c2f9cebb4a45f6bec4f2731d24e9b75a9696f6696216f1388a31d0dc SHA512 b51b06cc9a23a65c5cc75632f5c9b2cfa7e2bff9ced7527f1392c85631622c74bac2e0d3b106883f4e73012563b5eb8fd498e44d617a25bc15a41fe3c7d903cc
-EBUILD dropbox-147.4.4800.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
-EBUILD dropbox-148.4.4519.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+DIST dropbox-lnx.x86-150.4.5000.tar.gz 103645837 BLAKE2B e6f304c99cfe419aed2afe58a6e4f86dbcb4c81ddc9aed82635b715f735c70b196827bcba169ac04f77520b74aa1ad87507072ab5e383398fd2e03a56f339af1 SHA512 90f5568ac372120497b090b60204b3a671b25c38aa93ec0b70d0071bf91c9d656001df3ff1fec2a66fdcf1acdee0b8cc70c110c4d7091d2fac63c389baa70607
+DIST dropbox-lnx.x86-151.4.4304.tar.gz 104019555 BLAKE2B d5aa1b0ce651c9b41a959bfa299349432252f9689f3b647090cc584b7b9812d606cc0cbb863178e926d91486343672b6d1df3912173d3fbefdc56e0e4c68d45c SHA512 55e673da79db0b2b8c94592c440c81c677aa34ea213de84c3539c52040a15a63bea6f593a48415f502690171bc5e8439de4e3ab29f5be01677e1fe211e73815b
+DIST dropbox-lnx.x86_64-150.4.5000.tar.gz 105506526 BLAKE2B 44b13413b2480afd2849264c59e4d2fb17af014a56e9fbc7b75049b80e12d0ef86edfb1dfdfa3532f261280df7a19444307d862e9695dce3cf147ff39454742b SHA512 9f78e12047fad0c94331c4a12ef72d6afe0b8f044880a08cdc68ac7c9d2596325c5f732805870e656c36ab3825bcefed5542343f76c363811c68507cc8463cf7
+DIST dropbox-lnx.x86_64-151.4.4304.tar.gz 105875742 BLAKE2B ef3d84bf6483207b685ee5989788b4630a879a8b92a0cf6382e95f586c27358d856d74797876a08f85ce3f66d618a384d3afa1360a1a099984b6a965423f325e SHA512 ab3ec143365b9870b01969232b0faf102a51e0e385c3da33abc98381019a23162921242aca1a27b91885312776016f6e955ae42a44e98bb5f29c73be7949ff7f
+EBUILD dropbox-150.4.5000.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
+EBUILD dropbox-151.4.4304.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-147.4.4800.ebuild b/net-misc/dropbox/dropbox-150.4.5000.ebuild
index f43dae64fff9..f43dae64fff9 100644
--- a/net-misc/dropbox/dropbox-147.4.4800.ebuild
+++ b/net-misc/dropbox/dropbox-150.4.5000.ebuild
diff --git a/net-misc/dropbox/dropbox-148.4.4519.ebuild b/net-misc/dropbox/dropbox-151.4.4304.ebuild
index 0c3e0f739306..0c3e0f739306 100644
--- a/net-misc/dropbox/dropbox-148.4.4519.ebuild
+++ b/net-misc/dropbox/dropbox-151.4.4304.ebuild
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index ef217e626435..48708b43f39f 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,6 +1,6 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
-DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
-DIST electron-cash-4.2.3.tar.gz 7593885 BLAKE2B 902e1b93958b2796e2679327e81c9c5637f57ac1a840291b30a515bcd8c2b12724dfa075e38f1265eebc2a734bc715ddcbd98eaf13903d99b78fa3dd4f704d03 SHA512 0917d67501bb29dc49be25d7845a892c42f08718e7ff0560c27e34a6ba093acfd7ccf15cd1f5d09b03ff01b41c8d9cce84a9968388fae3d52f6a13f1cfb01a0a
-EBUILD electron-cash-4.0.2-r2.ebuild 3564 BLAKE2B 922e116a1440bd2b72322ba900a12ad85475f21fb3642be289a8d99ed7729f1f7b170ce58deeac28c2e0e67335cf8185f1306522f2ddb9db988eb8a3fad0d54a SHA512 1f174b1905d2a3032121a91fde9236a023f23857e7207ebf37bc5609ab600b6668afaa763448723da732230bb730013ef1d00e3b2f537c41a469b2e867522ed1
-EBUILD electron-cash-4.2.3.ebuild 3710 BLAKE2B 63aec594af519818245353d8496fa6a78d80ee26e1389c80993b071b89f04d66e558806c2feb2701e4b4047c810b2517d3b5239543b95620878b08d076c71f67 SHA512 baad7f7adf8f8679699184a2ec0735f1eb058298b7ee88dae8d1432fa3de19bfdcf52494a2f5cbd9659c46aaeb5302aa9cc481f7d0be4fce83f1164f1bdfd4c8
-MISC metadata.xml 1033 BLAKE2B 3457a56219654744e1b6af665d602a889a32d760b324d4a95484c48d55fb30f898b3ef33f99a5d056225a146f7ddc1c95dacd02779bdf5379e518ddb34f66918 SHA512 ac10c1d89a6deb3c8107aab8d4c538d008c7f4b325fe0b5e28c96b3f7fd5cbc7c4b699530996b9a41236516b79eb03caa76b3ed3c4d6b61846041dd9b93ffc94
+DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a
+DIST electron-cash-4.2.9.tar.gz 8023098 BLAKE2B 37a55e2161a8f7c2d9b11c1bc564d77ace84ad745be677bb41f07af2b8c18c223e6cf37c7df42dea170341f276babd8eda4bd9564e9069fc9623a059cc92f09b SHA512 e27dda4a4c8b81ad7b303652fdb2d893c3d53e76eb0f7e295753a7f92676c895ea8087e424a43bbb2d32db9a4f0e8c03b779cf9daf2ff8e51d4813a097ac9c6c
+EBUILD electron-cash-4.2.10.ebuild 3785 BLAKE2B 35214f7792a4dbfbfdaccb802a5e95b5479ca8a3dfec6763d49feeea0874267e87102b9258cd2fa3d087d31aa393a5df8bccee3a6f38ad64ae1984ab6d0b422d SHA512 9c2b44d48c6236a98457cfc90952a7ef1aecd444a3247076e590234bfbda5ee22f86981e213b1172657c01f3fb54bd99c32f38e3f983b5965a882f1112ca2c40
+EBUILD electron-cash-4.2.9.ebuild 3736 BLAKE2B 923872b101367b68dfcb37ff78150e7824d7e080b6985ea0821c65cc7bc430d6791dd4e916f98cf893f4277ed2c7b6b3182e67f6f2015bd464a532c6a7496ab2 SHA512 e103992e65ea1d1d6c188aecaa674264e208cdaf18dcec20216d407f4b9714efaa624c121008dc46bc8a602ac40945e90ae603f5a96abf740c234ef3dd5f7882
+MISC metadata.xml 981 BLAKE2B 10c823bd62005a00acf1e410e78a5e2917af126f1cc4c98608ab8277570c4defe53b3e282168189ac3c18634860a93b664c83cde1959553b0182069830c6f3a3 SHA512 30538ee18680bf39e49cc434977376b6bce2be717204781d2e17dffcdcfe4970a772834474511c12b94906d05f026882d3b6ffde8dd3992eb1030d3ee78c77d6
diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
index 35dac74afdd3..fc56ca7c306e 100644
--- a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
-HOMEPAGE="https://github.com/fyookball/electrum/"
-SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
 	l10n_es l10n_ja l10n_pt l10n_zh-CN"
+RESTRICT+=" test"
 
 REQUIRED_USE="
 	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
+	amodem? ( qt5 )
 	cosign? ( qt5 )
 	digitalbitbox? ( qt5 )
 	email? ( qt5 )
@@ -35,6 +36,7 @@ RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pathvalidate[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
 	dev-python/pyaes[${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
@@ -43,6 +45,8 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	net-libs/stem[${PYTHON_USEDEP}]
+	amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
@@ -51,6 +55,8 @@ RDEPEND="
 	dev-libs/libsecp256k1
 "
 
+distutils_enable_tests pytest
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS="RELEASE-NOTES"
@@ -62,7 +68,7 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	if use qt5; then
-		pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die
+		pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
 	else
 		sed "s|'electroncash_gui.qt',||" -i setup.py || die
 	fi
@@ -74,19 +80,18 @@ src_prepare() {
 		$(usex l10n_es '' spanish) \
 		$(usex l10n_zh-CN '' chinese_simplified) \
 	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+		rm -f "electroncash/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die
 	done
 
 	# Remove unrequested GUI implementations:
 	local gui setup_py_gui
 	for gui in  \
 		$(usex cli      '' stdio)  \
-		kivy \
 		$(usex qt5      '' qt   )  \
 		$(usex ncurses  '' text )  \
 	; do
-		rm gui/"${gui}"* -r || die
+		rm electroncash_gui/"${gui}"* -r || die
 	done
 
 	# And install requested ones...
@@ -112,7 +117,7 @@ src_prepare() {
 	# trezor requires python trezorlib module
 	# keepkey requires trezor
 	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
+		$(usex amodem          '' audio_modem          ) \
 		$(usex cosign          '' cosigner_pool        ) \
 		$(usex digitalbitbox   '' digitalbitbox        ) \
 		$(usex email           '' email_requests       ) \
@@ -123,7 +128,7 @@ src_prepare() {
 		trezor  \
 		$(usex vkb             '' virtualkeyboard      ) \
 	; do
-		rm -r plugins/"${plugin}"* || die
+		rm -r electroncash_plugins/"${plugin}"* || die
 		sed -i "/${plugin}/d" setup.py || die
 	done
 
@@ -142,11 +147,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-misc/electron-cash/electron-cash-4.2.3.ebuild b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
index 2bd6c9e8666a..ab269027a1f4 100644
--- a/net-misc/electron-cash/electron-cash-4.2.3.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
-HOMEPAGE="https://github.com/fyookball/electrum/"
-SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="amodem audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
 	l10n_es l10n_ja l10n_pt l10n_zh-CN"
 
 REQUIRED_USE="
-	!audio_modem
 	|| ( cli ncurses qt5 )
 	amodem? ( qt5 )
 	cosign? ( qt5 )
@@ -36,6 +35,7 @@ RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pathvalidate[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
 	dev-python/pyaes[${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
@@ -144,11 +144,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-misc/electron-cash/metadata.xml b/net-misc/electron-cash/metadata.xml
index 1b7e4b952e85..213f5fe41bbc 100644
--- a/net-misc/electron-cash/metadata.xml
+++ b/net-misc/electron-cash/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="amodem">Enable plugin to support Audio Modem</flag>
-		<flag name="audio_modem">Deprecated name for amodem</flag>
 		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
 		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
 		<flag name="email">Enable plugin to support emailing invoices</flag>
@@ -17,6 +16,6 @@
 		<flag name="vkb">Enable plugin for virtual keyboard</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">fyookball/electrum</remote-id>
+		<remote-id type="github">Electron-Cash/Electron-Cash</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index e56c2e0aa119..8d07cfa78093 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,4 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
-DIST electrum-4.2.1.gh.tar.gz 5066728 BLAKE2B 66b1ef4ec21f74f2f5c25de97a31c2ec23f907526df2ac661fdcb563e1e857ca88f4f534f2373e809ba978c66b78af72260af27944ac7aa8a92e86531827fef6 SHA512 b32ee5f8779bdb9bcda6a163f3f0a4cd95e91efb37418734c9f08930221ad15e54868fca0d5d0fb1dd3b1fac91b8cdea6c6ec822d98ad6b3d6ee01c841972e88
-EBUILD electrum-4.2.1-r1.ebuild 2307 BLAKE2B 48de95d56ee10861da40806431c10441ed3c364d251d762d5b81e316e2b70973886ff4f0621ff21976f45b04bb6c75514bd4c45da63ca243bca81d96528ede2f SHA512 b9071f5f882617cf8ba5667abbf658374548bd3a702a677b00bccd840de08cb305516a5496b71ab27260585dcfef02afe6a94e74814ae87eac66e2b99418721e
+DIST electrum-4.2.2.gh.tar.gz 5071636 BLAKE2B a13ae03e513736e5f24ded46a9b6ce13312a7d9243082f1d5b1948e7519f40f1fab238ec73550f72607ff2463a54a31f47c6ab8e511efddfcec362d5e427c6c1 SHA512 ae39ca0b548f3e4c7454096a7a05f9400a738e3b1c217ae9d41bf6156f7d642d3f1911f97829bfadbf6fdb6873538f38525363d256b363dac41d378c6b41002d
+EBUILD electrum-4.2.2.ebuild 2412 BLAKE2B 36f5445b5542899758480636ec24c1274201f926077305e871dd69420b235ab2ced4cd18399f09a24610f124cd8100b2b624016800b358ec600442a5d177511c SHA512 06273dd7ba69bce1f45d00527ab203cb34afe7f3dfcc2558e5add727337989889ca9b533599e67d7a8e84a232bed63d2b0941ea3e096d5768f725dcc137b53c8
 MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625
diff --git a/net-misc/electrum/electrum-4.2.1-r1.ebuild b/net-misc/electrum/electrum-4.2.2.ebuild
index 7811b4d896ad..3741fcfc777b 100644
--- a/net-misc/electrum/electrum-4.2.1-r1.ebuild
+++ b/net-misc/electrum/electrum-4.2.2.ebuild
@@ -62,6 +62,9 @@ src_prepare() {
 	# use backwards-compatible cryptodome API
 	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
 
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
 	local bestgui
 	if use qt5; then
 		bestgui=qt
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index 413d1d4ac725..9eefd71c7882 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -9,11 +9,10 @@ AUX exabgp.initd-r1 1591 BLAKE2B 10b61e1daf5d10a5e3d60c67bc3b67fdee1583d816d2b19
 AUX exabgp.initd-r2 1615 BLAKE2B 2396103f84c871aaf090ab1546abc724c783a4051750fb177431bb39d7af12f615119ea346774d08e50ea11ce289836aeba75803f740add6b43fdcdedb0b17ad SHA512 f46212597f90475559f30a8c8d5ee5c3d2f0f149305e9eb5fecd96d658e21768bff6379d8e51cd5550570681470b4747347b86c08ece3dc0bc34da0dd5d98337
 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
-DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
-DIST exabgp-4.2.16.tar.gz 2933071 BLAKE2B bc66ece537cb175811233d26f3445e1bb3f7d4f8950bf0839ced014430db17a4df614661448f275fb3a890bb2af6b2459f938f830c82f03a586829e7fe31caca SHA512 06731612df6f0f6623e8ad58c3b52fc4b5dee6b4bb3bb29cee272a4061ef087e2f98739a75cd07ae51e66fb633069926899882e6bab801010ad1db3333666471
 DIST exabgp-4.2.17.tar.gz 2933104 BLAKE2B 5751888232479c24aa4f66ef357821178c7a5564c0522adb8abf26057eb222ecfbb33caa6d9b71219b79fa309a0c4051b6098015c2362ad9c02e59326ee2bfac SHA512 2000856f540dcaed12dfaf54b689f6b04670f0ec8f19ec7a811ea8e54663afec68a7ae97ed79a001cc09ed42e6a1c5bd2d94ae0c3e3c8bde2da446cf00d66374
-EBUILD exabgp-4.2.11-r1.ebuild 1299 BLAKE2B b15271c374199edaa379240a18c56e5dc485714874a547f5436855454e4f4e6e8a4020620d7896b2dd19ca05e419ee66eadae0c715729b9d21b1c28445fa4ec6 SHA512 cfef1786caad92e870e52f7ca300b24c63d05049c9a4d3a057c7c5523bd94de3d291422b2346a6a5b8ef17137604577ca60bd00df76688018cb66b618aa1f0aa
-EBUILD exabgp-4.2.11-r2.ebuild 1489 BLAKE2B 3fc3ec8288a013c49f517b862411102035cae79d7d7d25d196a65913e4fd444f5e0890bb8b27b98889db8a73eb7aeb575b0bf38907e5886631f0be7787f0e16c SHA512 4c441e47f710a7582e44237e5447e27241ccebe4d95b580e73f3f020dbdd9ef33b60fd28a19c4409664e213f7f1452e893ddd1171d1760ce196586aad5e9b5fa
-EBUILD exabgp-4.2.16.ebuild 1489 BLAKE2B d24ad3b13c0c2257842bd5da941299ed5842e91ea834e1638035e77d48205a9ebfe79be40db9d173458d6c5b4430202c51f6ed0e19601b682aad72985e691462 SHA512 1a65970beb3fda0632b1a592e3eff764759ac99d70bcade37f96b3c5f2e1631949374fd0697d749617a203b97a5b43e232a88037e9c3e7251fed70eded845207
+DIST exabgp-4.2.19.tar.gz 2932903 BLAKE2B de988dca0d6c32dbe5a5a04a2f3b5065a71ec83aabccecf675ddf09f9bd38ee417b670c5a2940d12bf3618a9a39e8ec6d0184bfa77cfda8c5e853da0fd52bda4 SHA512 35031fbf1b73339926dd08c7edc80497c3a5c4d1a5d626bf2a704ad2e70baeca51a88fe56fe3e43b97187010cf7e89c2b69f0b28276bbf9a945e761c6578818f
+DIST exabgp-4.2.20.tar.gz 2933683 BLAKE2B 8d25442dd3e95ad6db2849adb2ba04563c9c2add50fe94993cc1d72f17c704118732c1a8b88cec48f4a5c3b3f186c66b6643d3d06543475a43f0630801394006 SHA512 39de1baa9a4abee9829b3dea211966ec58e487f26c7f9d0d0cd19f5fcca596c9d3a389073bcb19506924feb7af34f4ffc6cbf13b7471cf5e51857af35271e6a5
 EBUILD exabgp-4.2.17.ebuild 1489 BLAKE2B 69e14edfaaf3be4a1c6fca72b1d95074f3df9390a7f03884cafd14de372e75dc8bd6fd56cb7e2b61fdcd47dc212c537d05a87596bc4afb492e65f35a005e1bc4 SHA512 c340cf30a5d93531b2b31d055a3988b0a0359b49e526f3d9b7be10df04946808619a71da9c7408f5de32496b3a83cbd7e44e0176d589a6872a8a097e0b87b0fe
+EBUILD exabgp-4.2.19-r1.ebuild 1489 BLAKE2B ad0e2bce70750a7574e8d23bc17bcd5297e1bdd0d021bb3f0be80f2b233e01348ab34860fcb5be71fb2b5de3873a7c906625ce24faea4b776aaeafdc3993a090 SHA512 62fc8d9b5b52533b68076bf515f3dbd7fcc44218dd8ae89183a9f511fdd50239090e5e83aa511ed548378bf83c3b2471076c9bdd4d750ff96537a890d674aee7
+EBUILD exabgp-4.2.20.ebuild 1422 BLAKE2B d2544baa4c829fb2b3147e9f21857a61db31a010b2ce64dc03c60a6517298e7aee29b1b016d311af636668f134788b3e4bfd9fb8d530e4afa37ff9cfd505ed1d SHA512 684adff604df69fbdf6a143df6a36708b4ae5407467362afe7934f345c3653b8b50b64e7967f8a3c94644b5364805c946e7f8155665f5ab2cba078fea5ef27a2
 MISC metadata.xml 344 BLAKE2B 20bfa14279184ddbcd77773d12fb120d9182b2eab6f5e99c044229efcad49de8861f50ac3560cf85d79aec6fa67c54fef8b1a3a5fffef7c2ae9c36d1eb134bb4 SHA512 f10156cff443ec23883c09dcf78b83d2ea44c9730214b9197e2efdc56f3df0b934ed6db5eed258c5ca89886ec13049f9ef904972043a602606cc2529e8912d19
diff --git a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
deleted file mode 100644
index 1ec8278c5641..000000000000
--- a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
+++ /dev/null
@@ -1,60 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit tmpfiles systemd distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/exabgp
-	acct-user/exabgp
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/exabgp-4.2.7-paths.patch"
-	"${FILESDIR}/exabgp-4.2.10-ip-path.patch"
-)
-
-python_test() {
-	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
-	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
-	systemd_dounit etc/systemd/*
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	keepdir /etc/exabgp
-
-	doman doc/man/*.?
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/exabgp/exabgp-4.2.16.ebuild b/net-misc/exabgp/exabgp-4.2.19-r1.ebuild
index b04278316850..618539f9bee6 100644
--- a/net-misc/exabgp/exabgp-4.2.16.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.19-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.20.ebuild
index 0c9b22c44818..2bd1bad24a9e 100644
--- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit tmpfiles systemd distutils-r1
 
@@ -24,7 +24,6 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
@@ -37,15 +36,17 @@ PATCHES=(
 	"${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
 )
 
+distutils_enable_tests pytest
+
 python_test() {
 	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
-	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+	epytest
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 7379cb88b45d..6b03d10a8490 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,8 +1,6 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
-EBUILD frr-8.1-r1.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
-EBUILD frr-8.2.2.ebuild 3475 BLAKE2B e92fefd9d1326b742b21c96b47c18500736c7642ce745e07998ba17c48532bb97a48c47e6f3150cc65415c13995b86ef30e4382dbc165acf71e1dc56b931580c SHA512 a6e7eb0600f1d56df1446a2fbe988898c37397c61c02c5c3b13a98b5995664fd8f57c0fce2ba1ca91712f22cb0be84ce9864c0c214336d22dec57c3d7f04650f
+EBUILD frr-8.2.2.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
 MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
deleted file mode 100644
index 930f7303dc8f..000000000000
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	>=net-libs/libyang-2.0.0
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	~dev-util/clippy-${PV}
-	sys-devel/flex
-	virtual/yacc
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
-	!net-misc/quagga
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--with-clippy="${BROOT}"/usr/bin/clippy
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable ipv6 ospf6d)
-		$(use_enable ipv6 ripngd)
-		$(use_enable ipv6 rtadv)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	keepdir /etc/frr
-	fowners frr:frr /etc/frr
-	fperms 775 /etc/frr
-
-	# Create logs directory with the correct permissions
-	keepdir /var/log/frr
-	fowners frr:frr /var/log/frr
-	fperms 775 /var/log/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins tools/etc/frr/vtysh.conf
-	doins tools/etc/frr/frr.conf
-	doins tools/etc/frr/daemons
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/vtysh.conf
-	fowners frr:frr /etc/frr/frr.conf
-	fowners frr:frr /etc/frr/daemons
-	fperms 640 /etc/frr/vtysh.conf
-	fperms 640 /etc/frr/frr.conf
-	fperms 640 /etc/frr/daemons
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v1 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
index 44fb6e2685fc..930f7303dc8f 100644
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 774dff04a03b..44c2d68e3d50 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,10 @@
-DIST gallery-dl-1.21.0.tar.gz 425507 BLAKE2B ca31b169558385fa6ed6ce9fe8082fddcc7124f945fcfaef2aab13a4357fd9d488bdfde48c27d0a86fb0f626ea831e7dc3600c7e50abce2bbcfd37a350ee2767 SHA512 dc85d522e372e8ec2565029b9dc3d736b546b4cf66bd9242fdfa11aab30975263e221ba50234ace409a4cf3dc6f36d5b1031cfbf74dc4ba3053eded5aea7f38c
 DIST gallery-dl-1.21.1.tar.gz 432380 BLAKE2B 58267dad8af16cb8b03bc7532e934e15c510f8ac36a92cfbf4cf48791634973fa68dc0c1fae8968a5df1a340833980ef032c8c47fc2b2ae4c7b9018bf2d6b197 SHA512 6725937e81ef0ff6b3ad2718f51eb7be09ce364584b16be6031e5608f6b58b366aa96cf0616974147d4ec101825cdedbed8c8790970040f4f80e955847772901
 DIST gallery-dl-1.21.2.tar.gz 434114 BLAKE2B 2f1335d0745c3fd3de95f9f3005fc67f079fec16925b7ac8fb3f2e9c8521139e56bf18675e15e7e0edbad2889cd7fa895552e8b40d9f1cf6bc555894c8d1da48 SHA512 11615ebb3cab5a6d9e042a94cf802f3781af6166eb199ac22f70a0d3351299bdc82dda212a3a363c323e0edb6707355fe9b6f3d89a851037a8f6ebc12894558f
-EBUILD gallery-dl-1.21.0.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
-EBUILD gallery-dl-1.21.1.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
-EBUILD gallery-dl-1.21.2.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
-EBUILD gallery-dl-9999.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
+DIST gallery-dl-1.22.2.gh.tar.gz 463977 BLAKE2B f84837eaa0bdeccf7a63267c08657dc2fcbb17c218a10ed4b16d8b086f4aabca6097cb4161058b76796e96fa5fc57c8cde2a2f0387a28413cc6b6eab7a3f429b SHA512 b3a9790beed25a362a573b33dfaa18739072503d264044953b97e661e22c4850bfff04803e65f39b6ea9a077d3ffaa96a3c859f580f25890938e4f187c13a527
+DIST gallery-dl-1.22.3.gh.tar.gz 464060 BLAKE2B 6e9543675bb8118a73f81d1dffdfb20e91b385799a1bd9bbf2b5df331a384e55c4a503d5ac9e2f96e6d9d0f34913a4dcbb078c2b0044f9a418e8504e3b835cf9 SHA512 d544218f05a5ffb7eae83aa42bbc916d1b44233a50d11eed7d463c23718edaa144326dd8a88ca317f7fe0e8e1c737d5afc52e4db6d264be1cd3b63dbbfd76755
+EBUILD gallery-dl-1.21.1.ebuild 969 BLAKE2B e8df2558fdeb053b34e55fb7b8281c3bf06391f2887bf0ad2117de4f98af4768b03fb1aac05dfe8323e9b57b2dc44473cce7d5c85cb51d3c448badb7b663a4cb SHA512 8a60bddae7d2feacd7e4055974d50793d8fec7b49e0cb64f3de65f01f86341988dd459551bb3dca052c64b0aec97084c1dd5fdcd24c941427e8a87e2934c5839
+EBUILD gallery-dl-1.21.2.ebuild 970 BLAKE2B 02d9f20a5524e6c4d465e7e0d563aa67d2037f2f993283475b184802ce7bf32d223fb0ec5a01b3b0ffc98fde4b6679fdd593880ffb6a5769f52814813cdf8495 SHA512 55e9f67a1dfb021caa4b93f7852eebbe5bba1bac257e39f10f53dbe6aff8832261a6b27459e3d9fa680a7a1eafac2f896bd3cdd51ea97f0ed23ec068fa49f456
+EBUILD gallery-dl-1.22.2.ebuild 979 BLAKE2B 9e6700e273d97c79003117229dd323b2dccbc1122883006c935c46dd9dd2cd34ede0bd03f6f953aa6b89c67d6053681b5cdb1771f6d4b5b2ae6ae4ed3372dd26 SHA512 eb03f0ec65ce3c44cfcdab134113710525dc21e41de2eceda634765b8fe31b2f9f5dfa1404fc5d092c011d2a1ec6af09bccdf43c5de5cc60098f95b3ebe78563
+EBUILD gallery-dl-1.22.3.ebuild 979 BLAKE2B 9e6700e273d97c79003117229dd323b2dccbc1122883006c935c46dd9dd2cd34ede0bd03f6f953aa6b89c67d6053681b5cdb1771f6d4b5b2ae6ae4ed3372dd26 SHA512 eb03f0ec65ce3c44cfcdab134113710525dc21e41de2eceda634765b8fe31b2f9f5dfa1404fc5d092c011d2a1ec6af09bccdf43c5de5cc60098f95b3ebe78563
+EBUILD gallery-dl-9999.ebuild 979 BLAKE2B 9e6700e273d97c79003117229dd323b2dccbc1122883006c935c46dd9dd2cd34ede0bd03f6f953aa6b89c67d6053681b5cdb1771f6d4b5b2ae6ae4ed3372dd26 SHA512 eb03f0ec65ce3c44cfcdab134113710525dc21e41de2eceda634765b8fe31b2f9f5dfa1404fc5d092c011d2a1ec6af09bccdf43c5de5cc60098f95b3ebe78563
 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
index d424151deeb1..2290b4caea08 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
index d424151deeb1..0e2805dbf2af 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.22.2.ebuild
index d424151deeb1..60c3846252ce 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.22.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 fi
 
diff --git a/net-misc/gallery-dl/gallery-dl-1.22.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.22.3.ebuild
new file mode 100644
index 000000000000..60c3846252ce
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.22.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,ssl,xml"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# tests require network access
+RESTRICT="test"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index d424151deeb1..60c3846252ce 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 fi
 
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 03e3d70c5c7e..d26ed626b64a 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,27 +1,20 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
-DIST geoipupdate-4.3.0.tar.gz 28170 BLAKE2B 4a7cf9820a37b063665cd0494003fedd4b8a9835dc0746477f28287ccee619efe07c7af608ccb04293b817151fbe409f24c828a0c5f2bd4d60f8570b4df8d4f7 SHA512 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3
 DIST geoipupdate-4.8.0.tar.gz 33561 BLAKE2B 0553e52992243e9f4b2f098228810b2fc802ec312f6d41486088cef46170d23e23f936077b624e9587cf5a266629fe2bf6f9c8f025f63c00309f63151d270a1c SHA512 55a5ba2b0b92abfc1e7837206222702aaf98d2bd00494915426e02ead0004f5546f4e2abe99a914bebd41690b1253d7a2b19098c110882c5862a3bbf2092234a
+DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7
+DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
-DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 11234 BLAKE2B d806e8bf8671c1e1adf0dc95ea61efdba9a53ffd1e4b2cdd469030964c7137a51cc77ed65b2788ff4a692ab6ca46572f30e20b6b8c7887eb304c07d8f835fadc SHA512 bacd8f76999947d61c25839c38fa102b4cd7c2998573727309032db6ea47019147f51d2c03d38744e739b2e26afe0ad49c330e936649ad848d332ab1d04c3bca
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.zip 14710 BLAKE2B 0e469d2bd8959bb3b743637a7c88f9695342d66827fd4c372b67605082016619799e71b2a174c83bcbc3f72a0d816f123eec9d885146d6dd4f266482888ba7ed SHA512 9b42452b5fed988d4c786beb6fa65b0c277d5da64c0b74eb533647b792a2a8d9c68203409266e3a2402637f0decb28b131210cfaee1d3af792e557a1baa02a1f
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 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%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip 32231 BLAKE2B ebccf1282f99c7b889969d9a11be3aa98d662adb463ede02bc4ff2e2db757be5a9187f6ff0568ed08fde2438d2f66974972f25128ff252a4bafafef786448091 SHA512 46dc6e891a4bcd57ffae0777ac4c3b9bcebbb8d8a661704d9fada707221ad9fe9b37fe0a053824e4ee362a0fc4cd625e0379c4522f5526dd1353beffb62149e4
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip 18663 BLAKE2B ccec7bae555b0c549b5da7d2ca1a16d261721473c638aafee7bd80a1be86b3a377654e32bbcad0c040186767b2f3f92017c0df47f7b86a0c926aabfdbf708450 SHA512 13d7c1acdffefb28bdd1c9efdaa579cf94d02a187e1952fe5da1cccb4934c34329792776fa46e801b43fee8df15c3f9dcd0a7a3fe85b78942dcbafca6e106b7b
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -29,31 +22,18 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d1
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.zip 1496749 BLAKE2B 6f665574261f31847b1fafb76bf05483808610124bdf9bb22b976b93ef0d722a8cfd4892f48320ee0e7404b0876f65c37d945ce4466547d692d6fc00f4802c63 SHA512 604c6790250b7d05360cbd341cde88fc5c2a499bae119d51de5b073df0704089abd3b1536c5ef7008db7a5ef6dd8512824e77553ee8216134a2daa6cacb357c2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip 41507 BLAKE2B 1717646144575b87f757c60d60954498f6bbd58d166cfbf650fd16c7a96435f9a4ca93f775c47ac54348bf7416356b5a205f4683139aa59b3093c80a5236a93b SHA512 170b91617f7c7f85f2879c22bef923f2816702fe5774592711d1de1483d5f7359456f94a5a89b9f165d2c18d7ff00ce7b8b5c6d639b8647bdd0a8fa37f9f895a
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
 EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
-EBUILD geoipupdate-4.3.0.ebuild 2780 BLAKE2B 8cdd7ec3ee334c87e4944198db1e39d57469a0cf9cfce07bbad7b03aa9b790b40c85f057d93bbd9c92ba20423d52cb0d9386295ef5575e4590a6d257fae06472 SHA512 a80f829eac8e7e22205ce9625ce1948866ffb4c290f728e53d2a0f73000b65914c3b915c0c46d9fbe9951373d2b9141dc4acaf43135d4a9d8c1c7ce8c053dd7a
 EBUILD geoipupdate-4.8.0.ebuild 2501 BLAKE2B b44809a76968ebe69cfb356bff4d9ba28a03e2fa232a426c11a01c546029b45ce3e80f28ee228e46e4bd36fd06f876ed36cd9e40c99ff06f71a5b652eb2ecbb0 SHA512 1be347521422bb71ea15db83b270062452087fbd759dd0caa452a7405609f342f912daa12b283b9a9207ba76a8a5b9133680e2333dc28d09be5dbff435b9dd46
+EBUILD geoipupdate-4.9.0.ebuild 1176 BLAKE2B 14d943cc0ff71014c38ef3cd7745aac88b6e39db4aab593602f473c5532bd582861428200e40927013b7cd9e49eef6873d4102bf6d9cef236e7cc2922fb382f7 SHA512 1fbe8c4c06d84ad7585340cba140cc7d4c2bb53a816344b7929545ba4e55677c35cdcd79e37be70e256066560c99a4d9381fc37ab42329ec354dd87f4a95533d
 MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415
diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
deleted file mode 100644
index 9e77ca2c2a40..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/maxmind/${PN}"
-
-inherit go-module
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-EGO_SUM=(
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1" # SPDX:ISC
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/gofrs/flock v0.7.1" # SPDX:BSD-3-Clause
-	"github.com/gofrs/flock v0.7.1/go.mod"
-	"github.com/kr/pretty v0.2.0" # SPDX:MIT
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0" # SPDX:MIT
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/maxmind/geoipupdate v4.0.2+incompatible" # SPDX:MIT, SPDX:Apache
-	"github.com/pkg/errors v0.9.0" # SPDX:BSD-2-Clause
-	"github.com/pkg/errors v0.9.0/go.mod"
-	"github.com/pkg/errors v0.9.1" # SPDX:BSD-2-Clause
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0" # SPDX:BSD-3-Clause
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/spf13/pflag v1.0.5" # SPDX:BSD-3-Clause
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/stretchr/objx v0.1.0" # SPDX:MIT
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.4.0" # SPDX:MIT
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.0" # SPDX:MIT
-	"github.com/stretchr/testify v1.5.0/go.mod"
-	"github.com/stretchr/testify v1.5.1" # SPDX:MIT
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" # SPDX:BSD-2-Clause
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2" # SPDX:Apache-2.0, SPDX:MIT
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7" # SPDX:Apache-2.0, SPDX:MIT
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-)
-go-module_set_globals
-SRC_URI="
-	https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ppc64 x86"
-
-DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
-
-# Do not let these leak from outside into the package
-export GOBIN= GOPATH= GOCODE=
-
-src_compile() {
-	# requires pandoc but the information is still in the distributed md files
-	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
-	#sed -i -e 's/go build/go build -x/' Makefile || die
-
-	# the horror, the horror ... but it's all automagic
-	export CONFFILE=/etc/GeoIP.conf
-	export DATADIR=/usr/share/GeoIP
-	export VERSION=${PV}
-	default
-}
-
-src_install() {
-	dobin build/geoipupdate
-	keepdir /usr/share/GeoIP
-	insinto /etc
-	doins build/GeoIP.conf
-	einstalldocs
-}
diff --git a/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild
new file mode 100644
index 000000000000..e194c5758623
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~s390 ~x86"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+src_compile() {
+	# Do not let these leak from outside into the package
+	unset GOBIN GOPATH GOCODE
+
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	#sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+
+	default
+}
+
+src_install() {
+	dobin build/geoipupdate
+
+	keepdir /usr/share/GeoIP
+
+	insinto /etc
+	doins build/GeoIP.conf
+
+	einstalldocs
+}
diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest
index 7cd3e5073ea0..4091777ee109 100644
--- a/net-misc/gnome-connections/Manifest
+++ b/net-misc/gnome-connections/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-connections-42.1.2.tar.xz 3987992 BLAKE2B 2cad2376c238884b069767efbcd8afae5270f576e499fa59defe2d8ec10188cfd9b263a63cd44fcbe9ceed315267807f6b106f93d1fc73092e6c5366d9daac62 SHA512 34bc8e167ccd828c1aa52728017a52282d96b607751d566e3f8a5169d6fd5ccd7c6ae04abb073946f5cf6038c7b23b3eb897e2922b6d5b914d89ac0afbbbc7ed
-EBUILD gnome-connections-42.1.2.ebuild 1142 BLAKE2B 55e93469531e95fd8e6a756e557420374229ef20286b140be660f193d62da3d645ba4b0ba27fac814f388858c4e89493a9482e63879d11880342407fcfb44d85 SHA512 c65dcf3e54070ea3168b8af9121ef33ba02b238643b8d08f7b0103e0c59179f2e82064e0e06029107ba9cd639c65bd3824963014136e33316ddc2b64e4ab9740
+EBUILD gnome-connections-42.1.2.ebuild 1153 BLAKE2B c2f5086ba49ccd67cd00da72231416b69c3c69e248388c38552be5c6a1a771658d63016cf1f410f7887b3f22a7dc6f0e4cb81ae81f303beb1dce7ff8b38fc0a3 SHA512 a2561c1eb720ca715dff419446eda83f24863a2cf670f834acb2d80afbd5acd6a1afbb7e88c5979a0f539a945a623499f6b40459d3180f7b623f5fa4b63cc8db
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild b/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild
index 8fb4b3b9b9da..b73b0f74756b 100644
--- a/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild
+++ b/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild
@@ -18,8 +18,8 @@ DEPEND="
 	dev-libs/gobject-introspection
 	>=dev-libs/glib-2.50:2
 	>=x11-libs/gtk+-3.22:3[introspection]
-	>=net-libs/gtk-vnc-0.4.4[vala]
-	>=gui-libs/libhandy-1.2.0:1[vala]
+	>=net-libs/gtk-vnc-0.4.4[pulseaudio,vala]
+	>=gui-libs/libhandy-1.6.0:1[vala]
 	>=dev-libs/libxml2-2.7.8
 	app-crypt/libsecret[vala]
 
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index f29bdd4fb6ea..163fb4c50ccf 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,3 +1,4 @@
+DIST gnome-online-miners-3.34.0-tracker3.patch 61820 BLAKE2B 0f9f6f09ffb90a5087d227b9eee6f8016cd83cf2459d10a727448dd2a7263e5e1d0ad8b58932e3e7cb86dd32aafc3ead700f7db46d7f9a099ed000acc472aa2d SHA512 11d29fcb91175e6df20dcfdab8ae758a45d2ab03430c1b09284739ad5071b3c3a6297626dd4fa0584021c26d306dced4c0deb109e7488bf48627ee3bc32d443d
 DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464
-EBUILD gnome-online-miners-3.34.0-r1.ebuild 911 BLAKE2B 79d001643167f5c3b83b8f545b82a790d5db51fc4a79ecc39b1132e533a4effef3472a9532730b90f9c596b01f171aed88357960a65128c5d77be25f36b193c2 SHA512 484485cfc1b15a875c8da2431b13183df932827c30b1d015f3f3d0712ca8956b969a1480a437cf9be0e03ca3c17472415f0cf8eb9466f917482001f1b54d3e45
+EBUILD gnome-online-miners-3.34.0-r2.ebuild 1237 BLAKE2B 2f61c893bcd1ce0c94c561fc9fc74740a6b23c51a7286243202536ed9cd91c214e692a4212cc586ad24c281a394c81f1cc3892cb67fdd0cc5754c1efc9b0d953 SHA512 b01ace998509f7befbb2c196ceeaa52115c4d868989e1589f3192cf19ae5cdd5c6d3eb064b0019f61eeb422e82a8d775781cd50dbefa810eb9e3d2c0c4af2bc9
 MISC metadata.xml 313 BLAKE2B 14b8dc0d350cff3ce60111be31eaab9f7097a90bf3140bbd79e64fd91319819bcf63d50ac77ee4b5d65ec9fbc4df4b5fd73d2de2f242e02e6140aae39e3cf732 SHA512 2f69d70da13321905317bc066afa7c041d154eb4dbc3b86c912a971ad36c07a9d4d56b1bfc18651bcd84058cfeab254269670bdffe04366220132dba3d6ae0e9
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild
index 34df5197128c..491fb418c85f 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild
@@ -1,11 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+GNOME2_EAUTORECONF="yes"
+
 inherit gnome2
 
 DESCRIPTION="Crawls through your online content"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
+SRC_URI="${SRC_URI}
+	https://src.fedoraproject.org/rpms/gnome-online-miners/raw/f36/f/tracker3.patch -> ${P}-tracker3.patch"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -14,8 +18,8 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
-	>=app-misc/tracker-2:0=
-	>=dev-libs/glib-2.35.1:2
+	app-misc/tracker:3=
+	>=dev-libs/glib-2.56.0:2
 	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
 	media-libs/grilo:0.3
 	>=net-libs/gnome-online-accounts-3.13.3:=
@@ -23,9 +27,14 @@ RDEPEND="
 	>=net-libs/libzapojit-0.0.2
 	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# From Fedora, waiting to be accepted by upstream
+	# https://gitlab.gnome.org/GNOME/gnome-online-miners/-/merge_requests/3
+	"${DISTDIR}/${P}-tracker3.patch"
+)
 
 src_configure() {
 	gnome2_src_configure \
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 63272c416725..30e2b71ad30d 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,9 +1,3 @@
-DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5c039e7d236f45fa79a74ddc479f449b01ddb231368c4b604d28a8f796ab33f1648a332e110fd2adb9b739032dba67c029b9f8 SHA512 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb
-DIST gnome-remote-desktop-42.0.tar.xz 158448 BLAKE2B 35c5458ec314d7e3abc60583d136e18296609af2caac658cf936685085b6f8b6725bc453336131293dadd1b548d110a4cf5cf8871fcb80d838212e60e204feb1 SHA512 3bf03fc96205df4c5efcef0e340ad85e7011ad8e4fecf2e29d9902fbb1633801da7d1094645e850267249dda9383ae0aa782f3e0207a7351d764482f2d0dc349
-DIST gnome-remote-desktop-42.1.1.tar.xz 160632 BLAKE2B 9686a9fc626c7bb5cb57196ff24ba4c694edda2a9419697283746afaf166f57511e2949699cb92885e44687bf528dde0060b559c87a7fa623a0df4bbc83f7ce0 SHA512 4fbf9305aa7339d9e7fcbf8df8eea97ba675630f6d01ef9a9f049ca3a3bf930f26b0e993ffe386682906d719b15058ce752e4592a3e710ceceb977000ebb1ce1
-DIST gnome-remote-desktop-42.1.tar.xz 160320 BLAKE2B 6f797a49cd0e17f3a553b6bd63d32d22cfedc633230ab13cd464a8755c77a14cd26a5eeb7872573b527d3fa84ff05347ea50dc798aef2f631749c29076b8bf53 SHA512 3e17d6482941fccfe6860d2ca2db50235ee70a26fd8942ee1850addb11006cfb152dd949102a4c573f2b6a29f9f2bb78c9ad5be1cba8622ad5b54f82c509376f
-EBUILD gnome-remote-desktop-41.2.ebuild 1195 BLAKE2B eb6178bfec196d8139080fa5414f5d90670ccde2fa80bad95fa6c9f1b13b5ec59195e4e28935b32ecdd06dcb2955878280a1462917938911dae6028c903d2f1c SHA512 887d7d4ca98c987088f287c0baaf99e559b07fb92d15899a0dc2bc07dd1a2b351d8c8fa2c6fd11661ecef368692726a2945782750720f02b174daf3d4e6edfdc
-EBUILD gnome-remote-desktop-42.0.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
-EBUILD gnome-remote-desktop-42.1.1.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
-EBUILD gnome-remote-desktop-42.1.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
+DIST gnome-remote-desktop-42.2.tar.xz 165452 BLAKE2B 110d456dd6f91e00584755425b8dbad1e02ad9a0cef7a7325fcf8438c2e5cd64238fff7da17c6724f6b17ae24be4456e8470a2b519968d044386d3bf4cb36ab4 SHA512 620f2119bec845bf93226b1b873519c5609b7b6212232b33de2d1c420160378ad917c7b593b00c3e15a3b3c3788f3300ef89a226952afb6dae40f9fcc6782e16
+EBUILD gnome-remote-desktop-42.2.ebuild 1260 BLAKE2B e16100517cfefbade34a12ff2d2a68491a345c5be6e6396fee0471ae41457daa641a5a644d1c38440c6d5579abb86b8162c97b11f4cea240b750b339dca3b68a SHA512 d07d5b6a60cbafc21b979904944105b8e3996a21e5e88661d66246022ea7e968e0dd35b720c3f697ab77dfd8d1f5df04793821864ac1b3b042fbdbbf07f3e023
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
deleted file mode 100644
index f620ffba9531..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
-	x11-libs/cairo
-	>=dev-libs/glib-2.68:2
-	>=media-video/pipewire-0.3.0:=
-	app-crypt/libsecret
-	x11-libs/libnotify
-	rdp? (
-		>=net-misc/freerdp-2.3:=[server]
-		>=sys-fs/fuse-3.9.1
-		>=x11-libs/libxkbcommon-1.0.0
-	)
-	vnc? (
-		net-libs/libvncserver
-	)
-"
-RDEPEND="${DEPEND}
-	x11-wm/mutter[screencast]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use rdp)
-		$(meson_use vnc)
-		-Dnvenc=false
-		$(meson_use systemd)
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild
deleted file mode 100644
index e0ed71da320e..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
-	x11-libs/cairo
-	>=dev-libs/glib-2.68:2
-	>=media-video/pipewire-0.3.0:=
-	app-crypt/libsecret
-	x11-libs/libnotify
-	media-libs/libepoxy
-	x11-libs/libdrm
-	rdp? (
-		>=media-libs/nv-codec-headers-11.1.5.0
-		>=net-misc/freerdp-2.5.0:=[server]
-		>=sys-fs/fuse-3.9.1
-		>=x11-libs/libxkbcommon-1.0.0
-	)
-	vnc? (
-		net-libs/libvncserver
-	)
-"
-RDEPEND="${DEPEND}
-	x11-wm/mutter[screencast]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use rdp)
-		$(meson_use vnc)
-		$(meson_use systemd)
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild
deleted file mode 100644
index e0ed71da320e..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
-	x11-libs/cairo
-	>=dev-libs/glib-2.68:2
-	>=media-video/pipewire-0.3.0:=
-	app-crypt/libsecret
-	x11-libs/libnotify
-	media-libs/libepoxy
-	x11-libs/libdrm
-	rdp? (
-		>=media-libs/nv-codec-headers-11.1.5.0
-		>=net-misc/freerdp-2.5.0:=[server]
-		>=sys-fs/fuse-3.9.1
-		>=x11-libs/libxkbcommon-1.0.0
-	)
-	vnc? (
-		net-libs/libvncserver
-	)
-"
-RDEPEND="${DEPEND}
-	x11-wm/mutter[screencast]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use rdp)
-		$(meson_use vnc)
-		$(meson_use systemd)
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.2.ebuild
index e0ed71da320e..b7ff4b497493 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
 DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 3f39f16b305c..795fb1eeb6fb 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,8 +1,10 @@
 AUX 299.patch 3435 BLAKE2B 04b4c27800ee95e185aff83e1fd2453c30559fce7034a42821482cac9b4d409d3945813fef736e7adb744b9d865e31afab60c6ac457af968d7dbc319872ad5ea SHA512 b425c524b28a3e245a4de6090b052a2b1e08a06b5b8227450f91a127d4ea67cc8b1f3a74ac802f1525126d236fa1ad2de0a171ef0fa241ad27b1164606ec0501
+AUX 363.patch 579 BLAKE2B 7402bde852b1317fd0f072902a8475c5e55e55b7001e8a87d834f7ddf6ae6c21d2f7df387df73ec64ac49086565efc131eb098c64568a9fbe6f5a48ad4a78e57 SHA512 9c4d73105309bb25e03d692313c46c5281b8b0b1f1f3f4fb7bfdd5d167d642e966203024d675d9139ca92de72a2d796819f04e8940da9c8bbb746eb8b5ed615f
 DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888
 DIST grive-0.5.2_pre20200205.tar.gz 170384 BLAKE2B dac8d75bdefe0c206f443010093e73b34ae8257a5ced87917cca240fb7134a6aac8e5f018eeb7bf7dec46d5043e144efb2c9586ca2b5ff55a1d0fe022f72675a SHA512 d1058649d2a3dce773eab53b1704c5dd8bb1998089099ed9c3bacdaa5d3f995fa08c1b2c2b723bbce0efa2c9c04729d97aade6df6130da32f975e2bb45f339e6
 DIST grive-0.5.2_pre20211128.tar.gz 171412 BLAKE2B 62e966917959ed4306a7a787948bc1533cca6a5521f262450658c81f6dc88cb7914df6c3a8271d87fdc189ff74ada421f76c38bd9b89157cd27ef0f2ba531e67 SHA512 33e6a382f979a0a7a6c4236bce1779bbda0b3817b7d2f1750f6759350d7de79bd999bd0f4f7cb72fd32586683053ef1d21dc830403a9d1225b6e9a3408f830fa
 EBUILD grive-0.5.1-r1.ebuild 787 BLAKE2B 7737e8622f3779d8a121b18bd09fd3717b019576fa1ada046dc104e3f23445b297d749bf6a3557b58a212839c6611c916e872455890be7aae01be1cf1ffdf574 SHA512 41bfbcd2dc7038d879db312b4701b4bd37cbbb8fa065a720dd5de71903aac8745c9ff679e96df1accd9e316badb1e02fd4562ff734fe52e79c53f2133f054dfd
 EBUILD grive-0.5.2_pre20200205.ebuild 804 BLAKE2B 52c46fe6396ab3d8cbefd8591f6b02ca5dfaa0815812ddc5cdb284fb0faca5a160755a99ab94ed87582911baa1e920f1902ed3abb6fc41fffcf9c73e45cfcc74 SHA512 cc872fbc59c008773dc275eadf339db3f4d4b6ff92d974f1af55fd7f6f681ac238bc67c32db900d467d224ae294623dd5875ceb799bffc7bce06a7648eca5d26
+EBUILD grive-0.5.2_pre20211128-r1.ebuild 841 BLAKE2B 088460e3ef13a0af65753ef8ca914c22be72e830b0a3ae8d05b33a891c902190dac1522f5fab9705b9be2f0010ed5d8bbb903c60f634cf73f695daa0836ccd07 SHA512 14a6985e97670d42f3d238703ebec02909f38e9a01361766fdd226ea26eafbe706f3ba79112f1a87b194f1921089142b77eae82761df83819cd24b8a337d067b
 EBUILD grive-0.5.2_pre20211128.ebuild 804 BLAKE2B 467fc7d9022d2f45c9aa5615deb5506251b3cf31be9dced9d2e1e56f10315c7c8397b00594773e973a91dc307b647011930fb05fafdd36b68e56c4f621be84a4 SHA512 d9fc5fe24d4840f452aab215772fbd12cf227c13dd2239fb4da413c711e32c2adeea4aa06088190fe3a75312b1ae2d70d3f4a73e646cd1de23747f9e9312c30a
 MISC metadata.xml 330 BLAKE2B 92f51d3512032afcce83d09f6543814fac1f75b79e89f9d350654d4f3954fd4a77afc9f3f5f2a27c8c1e57f22829ef27643383c0a9e58ca035c1a16e5d38cde5 SHA512 ddc7be8e9e3f6e5069c5a048e77e0d1de84d39ab7377ab89078ed446225e5a37d4bf5959d4761ba2bb954dc046c4b83a7418705b8e7e3565595200b4a4a0bc63
diff --git a/net-misc/grive/files/363.patch b/net-misc/grive/files/363.patch
new file mode 100644
index 000000000000..c3e57460f386
--- /dev/null
+++ b/net-misc/grive/files/363.patch
@@ -0,0 +1,21 @@
+From 3cf1c058a3e61deb370dde36024a106a213ab2c6 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@gentoo.org>
+Date: Sat, 21 May 2022 09:36:52 -0600
+Subject: [PATCH] Syncer.hh: fix build with gcc-12
+
+---
+ libgrive/src/base/Syncer.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgrive/src/base/Syncer.hh b/libgrive/src/base/Syncer.hh
+index 237b8949..9b6ae4f7 100644
+--- a/libgrive/src/base/Syncer.hh
++++ b/libgrive/src/base/Syncer.hh
+@@ -21,6 +21,7 @@
+ 
+ #include "util/FileSystem.hh"
+ 
++#include <memory>
+ #include <string>
+ #include <vector>
+ #include <iosfwd>
diff --git a/net-misc/grive/grive-0.5.2_pre20211128-r1.ebuild b/net-misc/grive/grive-0.5.2_pre20211128-r1.ebuild
new file mode 100644
index 000000000000..c656088b952d
--- /dev/null
+++ b/net-misc/grive/grive-0.5.2_pre20211128-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="6901fbb169eaae51acb61778760ba2ac019675ae"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	dev-libs/yajl
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/363.patch" )
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index ddfbf0e29e8d..e5fb90901c6e 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,3 +1,5 @@
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
+DIST gsasl-2.0.0.tar.gz 3274625 BLAKE2B fb9ce9b3be0cbd0902128a3e8b57ad1f78c9259da646d3da56777b05922152c5e7f019a4c037a9e42a161153e87b140146eab2f2a55e33de9b52d6814a250fd3 SHA512 b7c4e3dfdaa50eaba38f3c0914dedb4bc689d1226fcf162e5bfb3942fa6ce1e96405715a747adca78150709f34830f699e9f995f04ce586cd3d0c14b275910e6
 EBUILD gsasl-1.10.0.ebuild 1904 BLAKE2B 3bc572a83c0dfa8837a6e8223bbbc2480a9a76746192884c4e85d6146ee0fa11b01fb38ba62a634f1f02be23a48fa86c68da085772cd3211fb30bf7b1c12b3bf SHA512 8daca23e2fbc2e6bb5fa0a4c671fcbb8f714043bead8e772d5735ff2f1879f0525dd20692281b90feaac735064a4732671617cfacc18b024d178d854acc0655d
-MISC metadata.xml 371 BLAKE2B 950b0f1ca053a194d24b37fff9283b921cf14c2c6a272967b96410badce4f45c89c752839807e726c4437b2dc4effe016ed0f0854f0c15efe3c5c6981ef4cbe3 SHA512 d2b3e44d0a31742b4d743a18366065c7b67157bbfff95cacc79ca0fa8d39becc7be6cdc134b26d7eacedfc5bfa78d36328582a9ba6abbd89df1473a9a8477981
+EBUILD gsasl-2.0.0.ebuild 1928 BLAKE2B bb27aa011b3c788ad42602e5017b6ad28a9dbcc46a84bde17db998ef89a6b6c9f4fa2b51b989eb8243558d0ae2e90bd1bf08abc2aee9a86762a5d1de81049473 SHA512 625c199482aa49fad63c6b93d1479a918323b6055ecd595821717d20e0553b4685fb02e09325c1bdd8ad36befd154164c8039bcde2dadbfe6863d59fb69490e1
+MISC metadata.xml 579 BLAKE2B 87f59c4a4c3ba2b3741aac713b47ec1357889afce3d06919705a5e31fba874ba5e0ba53c1a43cfb465d4c3ed138d465060f883afedd882547a39cefd58e20c01 SHA512 ccf34d49ff3453e97e1e4c2c9c769ea7ae201243d3756bd7154cf98581e704ae980a6e82ba8020993e42956a512111972ba2cc39e0f3fe789b1080ebe9e5f351
diff --git a/net-misc/gsasl/gsasl-2.0.0.ebuild b/net-misc/gsasl/gsasl-2.0.0.ebuild
new file mode 100644
index 000000000000..b784eb48e102
--- /dev/null
+++ b/net-misc/gsasl/gsasl-2.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
+# if it's a stable release or not!
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="
+	!net-libs/libgsasl
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	gnutls? ( net-libs/gnutls:= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( >=net-libs/libntlm-0.3.5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/gl_WARN_ADD(\[-Werror/d' \
+		-e 's/ -Werror//' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl
+
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl="
+
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
+	fi
+
+	local myeconfargs=(
+		--disable-valgrind-tests
+		--disable-rpath
+
+		--with-packager-bug-reports="https://bugs.gentoo.org"
+		--with-packager-version="r${PR}"
+		--with-packager="Gentoo Linux"
+
+		$(use_enable client)
+		$(use_enable server)
+
+		$(use_enable kerberos gssapi)
+		${krb5_impl}
+		$(use_enable kerberos gs2)
+
+		$(use_with gcrypt libgcrypt)
+		$(use_with gnutls)
+		$(use_enable nls)
+		$(use_with idn stringprep)
+		$(use_enable ntlm)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/lib*/lib*.la || die
+	fi
+
+	doman doc/gsasl.1 doc/man/*.3
+}
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 3f80b3d7f44a..165c218f0155 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -2,12 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-<use>
-<flag name="gcrypt">
-	Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
-</flag>
-<flag name="ntlm">
-	Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg>
-</flag>
-</use>
+	<use>
+		<flag name="client">
+			Build client component
+		</flag>
+		<flag name="gcrypt">
+			Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
+		</flag>
+		<flag name="ntlm">
+			Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg>
+		</flag>
+		<flag name="server">
+			Build server component
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">gsasl/gsasl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index a95805e3233c..c2e6a758545b 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -4,6 +4,8 @@ AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc
 AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
 DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c
 DIST gsutil_4.68.tar.gz 4459899 BLAKE2B 9855d379ba0483f1a33e4e05546444ff492c72d241ff0e5ca4f6c798c91b0c8d729247bf5fbaa39c411eb7a7e3f1fa701363898b903ba11c1bdf41c7e969c44d SHA512 b4af124808f34b5c0aa1d31b6d1bdbdeb451d39a246d4f2876ef664b6b485cdc5dc63bc3992ca4b7b33c72a00fc5119b931625e2c3230970bf0baa6389715e39
+DIST gsutil_5.9.tar.gz 11620858 BLAKE2B 09f2a79d14458a6545c45df23bd86a2769a00441ff03ae47a984cf18ae20c38e7b725f148c4e1d465f850f89871ad70b29463b8c829674d9d70d330b008595c7 SHA512 4916f3ac9c00c310a3dbc342ea0ab245cdf6952a4cee4e5b810f73254fb93439bcd7be35acbedac43501c3f19d8851848eeeff5b6ada6f31d93d478809518e35
 EBUILD gsutil-4.60-r1.ebuild 3072 BLAKE2B 267dbbd52f525a90532b151eac417b5ad3abc88705b698c84ba765a4f71494ba39e858c0912dbba1f33fb56ed83f7e055d710d2330563c3d74838c134de01aa3 SHA512 c4c536f87b66a699b8b28da4b26245f923b9132e2f69369cc53dbe0baa051e15089a92b03031428b742b1f7ec035a2b09148746aff80822c508191f07fdbe93b
 EBUILD gsutil-4.68.ebuild 3037 BLAKE2B 0fc9cdc2fbb439682e80a3c3333c3ddb79a9065285f36e94199a4601eeae16d7471002fb5d3af3291bf77122aee40bc4658ded78c0f15234e0f3848412bb1bee SHA512 fff0bf4340e89fc6803725e569e68314ffe96f7113ba5d8c7d29c46e158b2dbb6567f79f1b321949c143dbfc12bf9d46e13711c33abc56e4d80a09e975aab1c0
+EBUILD gsutil-5.9.ebuild 2921 BLAKE2B 985dd61bc358cacf80b046d494f3dc237e5eaa297d079dac988cb0c9a853dad383fb39cd683a437d1cc260725ea0f39c9eab569db044322a1d5ea67843203673 SHA512 8efc4a466896c3208a1b8ba233d0467a9595ddd59d709d75a9a9ab9cf79286ae9bb4987fae53ab56d105d4468695928f42635467b4b832f454444844991c8355
 MISC metadata.xml 515 BLAKE2B 3e6c5322e5a945b1ea9e073ba98e135fdebf5d28f34bd6e5116f11668bf3505a6b8ab6f770348f2318c2bd3aa3aef782738e14ef6de60ee7c6fc1413a4a5a9c0 SHA512 53a143192dd605277e3ac4b8875400fbbcb892964e521de8768894f40580169d8ffd68f715a97f692b881ae6dc578a79e8d4573528bbdd881ffe4112d0d59734
diff --git a/net-misc/gsutil/gsutil-5.9.ebuild b/net-misc/gsutil/gsutil-5.9.ebuild
new file mode 100644
index 000000000000..2dd866b29dda
--- /dev/null
+++ b/net-misc/gsutil/gsutil-5.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-3.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.20.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/gsutil-4.41-tests.patch"
+	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
+	"${FILESDIR}/gsutil-4.50-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# Needs to talk to Google to run tests.
+RESTRICT+=" test"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# NB: We don't delete all of boto/ because the tests are imported by the
+	# production code.  The same reason we can't delete gslib/tests/.  We can
+	# delete the main boto library and use the system version though.
+	rm -r gslib/vendored/boto/boto || die
+
+	# Fails to compile with py3.
+	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py gslib/tests/test_wrapped_credentials.py || die
+
+	# monotonic is only used by bundled fasteners that we do not install.
+	sed -i \
+		-e 's/mock==/mock>=/' \
+		-e '/monotonic/d' \
+		setup.py || die
+	# Sanity check we didn't miss any updates.
+	grep '==' setup.py && die "Need to update version requirements"
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady.
+	sed -i \
+		-e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		gslib/tests/test_cp.py || die
+
+	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
+		gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -i -e 's/sys.stderr.close()/#&/' \
+		gslib/tests/testcase/unit_testcase.py || die
+}
+
+python_test() {
+	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
+		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index 8996025a453f..f3f4272ab467 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-tools-0.10.2.tar.xz 181020 BLAKE2B ae6666d0876cfa57df56720b178d4b9bb492d9dbc82582ecaa09d178e20f55b3d045085b20965af2a9efd30fb9de0155f29b824ef004dd67309ed2be0a1fe487 SHA512 acb48b6081851345a01bd4604f4c83beca0fcff627e9d282efd807f5c98739ca4967a428456487e27196d1be6d65dd9482a12267da146e4efe0f61fa5a43c7a2
+DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a26849db544fe1cb017ca86e6208f037b09e772109bfac150a9f6db845d1212af5a5c624d81958816349b3c60e45b80933 SHA512 a95a169c65e50d9953b79b96b92abbad709adc0bf74db47abaa529bd7989ebe2d41ae30ab340d09e5a727b61200d55a6d34b04d6981327b920d23a7c916babbe
 EBUILD gupnp-tools-0.10.2.ebuild 695 BLAKE2B e0ff0a4b21136529369cfe4b3dc2266494eca7a2e532a2e0394b12f2e59ea617fbc8bc06619a52476bc906ff6220f67ee0369b11bc23170282605b3eca4e20d3 SHA512 4a77c5525d8b3dfb4d4bcd217dc5f70e5c7690081a5d71730fd3e8a77c73fbfc3d43b1cdb96bd43d03a2be422d9b6ecef688c20ba97c443f29c6668b3710051a
+EBUILD gupnp-tools-0.10.3.ebuild 697 BLAKE2B 2cae77eb3730e2a09db2f63d940b42c99beae7ebb39c14e567d8b79b41a821f1753b1f90181ded9c3ff75e1fe2a0438101f1fd8d21281e60bca0f5003ba03808 SHA512 918eacea32dfb92d50d416f591628b2e15ee78f68bbffec24a07e3d9d4aa95e70d12b1ebf11f26e66309363a45e0ceecc81828087e8aecc8e23a892a9c3159c0
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
new file mode 100644
index 000000000000..6655aaccb458
--- /dev/null
+++ b/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="Collection of developer-oriented UPnP tools"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=net-libs/gssdp-1.2.0:=
+	>=net-libs/gupnp-1.4.0:=
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/gupnp-av-0.5.5:0=
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/glib-2.24:2
+	>=dev-libs/libxml2-2.4:2
+	x11-libs/gtksourceview:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dav-tools=true
+	)
+	meson_src_configure
+}
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
index f6a4907c8100..f00fd6a2ffa1 100644
--- a/net-misc/hashcash/Manifest
+++ b/net-misc/hashcash/Manifest
@@ -1,3 +1,3 @@
 DIST hashcash-1.22.tgz 195193 BLAKE2B 2944dd8a852720af7deff1a85cbfc07e828bf2242996b95d8d05a3a8a3ece90abc47483252920ec14b603978aae2ddb9e770ef7b52904b3d24320b68e6695b37 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2
 EBUILD hashcash-1.22-r2.ebuild 670 BLAKE2B f6b042f0c1367fa7f5b0b1cca7deb08d28ac09ac7dc560424912f84e7034d212f2f7d9d842315f39795e3c5abc858c683a991ecd97cd190a2f90215b4a3ba61c SHA512 3bec3f7e0f646ae7d40deb894e6c0e137e2403d3f5e1d2b681af2058b94382d20a1152a9e4ffed00e6ff4eefebb4209a1ad76a19d8d468eba160d99b84e400db
-MISC metadata.xml 398 BLAKE2B 4a45b75d7c691fb1695c055c6a79bdd8a8576a54cb61312031af83aeaa69a435d4d4b748b2562cb19401edf5daed3b9b9694f3826e51c97b7329d727fc80681d SHA512 9f65cfc45897fe22bf54b2a7c6618002b3be7e427af2a9bb3c165f07340e8ef25f23ad7fcf0c79b1ef060fd0e78200da4a2f33a5a77ece8f21b369039063ffc5
+MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
index 3ea1da8fe807..bef24d2c2337 100644
--- a/net-misc/hashcash/metadata.xml
+++ b/net-misc/hashcash/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>ngg@ngg.hu</email>
-    <name>Gergely Nagy</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index d7d8f828ddeb..97284ba5ba2c 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -7,4 +7,4 @@ EBUILD htpdate-1.2.2.ebuild 1004 BLAKE2B 5a0491ca50a095a94ff339ab6343c7dae1d3596
 EBUILD htpdate-1.3.3.ebuild 1419 BLAKE2B a7e6c5f37ad0f88439655367bbcf85c950cf39bea3bd01190773eefb3f89b27ae0d1a468fa584afa2b83633252972974b83eba241b3230ace191df593af1ad3f SHA512 997518b4bdebe852fe539813ba0024da6a2196f0cc0683dad8a901cc5d5c370f950d6b37ee3f6d12706b246e74167e243d0a1d07d7c55106cc805758054d18e1
 EBUILD htpdate-1.3.4.ebuild 1419 BLAKE2B 6b8ce12848ba935d75baee8fb6201909092ce0d99a978fd30715ea9a37e05c6f3afb1fef46731714dcb8f7886d4f3c88626fff173b43231613921c92555eae3d SHA512 cf90b252aef4b7b49f618a864e6ce7129a32107f46cd00534d5bc682a2970b127fea7a5dfd3606b78cfc141f03d0ed9c4cc6d8498c6392dc78ea70a7e696fc66
 EBUILD htpdate-9999.ebuild 1419 BLAKE2B 6b8ce12848ba935d75baee8fb6201909092ce0d99a978fd30715ea9a37e05c6f3afb1fef46731714dcb8f7886d4f3c88626fff173b43231613921c92555eae3d SHA512 cf90b252aef4b7b49f618a864e6ce7129a32107f46cd00534d5bc682a2970b127fea7a5dfd3606b78cfc141f03d0ed9c4cc6d8498c6392dc78ea70a7e696fc66
-MISC metadata.xml 332 BLAKE2B 6c0897fc2de1055040f534683bd62cf5341a128d3959f75dc1cae9a356a3ec2524f325eb0dd948492bdbc8718edeec627e8280841c8c61ae1b3cf5c54b246c8f SHA512 8c0feeb2a16e0c085b414735707f98fa0a2727a1b9cb1727511fdae315dcd012c59441d78185ecd6f87feb38db4e787ae267e9fd296fa88d64b76bed0d1c8c52
+MISC metadata.xml 248 BLAKE2B 36b9e99b1cad92095b644b68bbb5b7291d851b07b5ac4151a4b79944751d33aa8f7a7680003e8faf2639c1bd96143ebc9cdb408752ab1de4b08eb84f311c11ad SHA512 1e303129601f933d75d269965d19944251432c8020f240672f51e95db752297fccf464de809b0a89832507e069f05178da09f6ffbbacf461bc895f392cfcfe2b
diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml
index 838fdf83592c..4c126b243f03 100644
--- a/net-misc/htpdate/metadata.xml
+++ b/net-misc/htpdate/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">angeloc/htpdate</remote-id>
 	</upstream>
diff --git a/net-misc/httpstat/Manifest b/net-misc/httpstat/Manifest
index eba7fc5e8c60..a172b0d30b93 100644
--- a/net-misc/httpstat/Manifest
+++ b/net-misc/httpstat/Manifest
@@ -1,4 +1,4 @@
 AUX httpstat-1.2.1-gentoo-tests.patch 840 BLAKE2B 478fc8c29c816be383def1d2f2194fe7d0fb888487c45afeba9b3a7808bbc01cbf1c836ee14b5f57115e19a1f63537736d137e19b3e1eac9b8af65f3519d5142 SHA512 6e904552c42e8d5cc9f6b298902601cb7ce1304ba2c85f0910f508ac09e5257562e7ed94fb0462512f02caff2a83fa2bb6ec35045a720e25c4f91e976cd1c99b
 DIST httpstat-1.3.1.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46
 EBUILD httpstat-1.3.1.ebuild 650 BLAKE2B da13605ceb5700872500b0d5f6f6777dd3cb182843045dc3f60458f5799a03c8b4d25df272c67f6d8c99c9e4dd1439823894a466e50300f515a063b7eb27495a SHA512 914a8470f9956833d92dac55b3d9d8d70f48346e94bdc2c44364293700ed4e25eb7da0e80984f54011612e2989e52015abc5481d5fb234a9f638ca38114c7af4
-MISC metadata.xml 463 BLAKE2B 02547fccbd3cf33f18157169b7073b8828611b089fdf13cb18aa94ca6332008bcc0c2eb37b841f929a7c103c49682ea2e35f56a7e3cd7b9e284d977fa2a28171 SHA512 974112132619d44bac543100a4babd1ba13db334110d29755d9b02fba643c192998cca704950ecc3cd8118dbaa9c924db496f918905093738048c91b7c5b0f69
+MISC metadata.xml 379 BLAKE2B 2bf8e348f9314b52a7229deeee8552e1a60e7942b078548f4ad5cc6b80ac6736f9e4564b617ca76788f948615074c409cd23603e73644b60b91b197aefeffaca SHA512 d1f896253bd8562247f3799f32f28d7408faff5d6e598ebc34e4b781691b2a5b2c61e3eabc3e01f0ad55d80660ce0501e8a95d3795f27d14d70de9f727ab5295
diff --git a/net-misc/httpstat/metadata.xml b/net-misc/httpstat/metadata.xml
index 556bbae45e50..be402a6b8eb8 100644
--- a/net-misc/httpstat/metadata.xml
+++ b/net-misc/httpstat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 5495f9ed632e..bfbd99f61203 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -5,13 +5,7 @@ AUX ctxwebhelper.desktop 320 BLAKE2B 877ade9bf35ca53ca81315e7ab6e9854e35d2392ad3
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-21.8.0.40.tar.gz 150632410 BLAKE2B a63480e5c5a934a06a66e6754013e6a75a962d36b851c9a43d9dcef6e0dc99aeea1331a547386f72a1700bd1c3b31994506b8c0923656fa7bbf8bedf0bcaf032 SHA512 6673312555d1b391bfadcde72ca6d6439f477a53b1206fae403921f73aa7535e7df56eefc226372ddd7707601368e32c5393f91f8a7ffb68f7c66da88ded128a
-DIST linuxx64-21.9.0.25.tar.gz 157545077 BLAKE2B c35d5da11809d68a8618d5d07df092f0ccc1af4f32485dbf5032aa7cfc0a78311d742e34bece6791c80d2798c277a9cc1a618bb2291d63b97926cda42fcd2fb4 SHA512 f111ba048464aad1ecdd543faf6cd7db2ea45b7934f9acf06864239ff653eb0d87abe8267a7717db45b6607b20764e1c26e0901e82e6907a4a3c09d6b331449e
-DIST linuxx64-22.3.0.24.tar.gz 161513614 BLAKE2B 8e1d4756a0e25f8b03b2c17251dccedcf48107f55356fe79616935496216305b5ebea19e33741fd0d613812f6eabd920e5edbfca84871249b0552eb4be3761a1 SHA512 87ef69eb6fd25984c70a2646e0c151f162962c848d20769625854a5ff9f6364a16c04dea6145751ebb7e29c0f0bb93760500de1c631699e1c4fc6e8de131e06e
-DIST linuxx86-21.8.0.40.tar.gz 135966502 BLAKE2B a870cbe584958deeb5727a3994d6bfd93c62f2e6a100c029cd1d5514ee6a8d788ed43b51a6bd01b7ba47f12d40b0669807183717b7231b0cc9b919654279e4ac SHA512 86e82ee8d00604f75e7042989e298a87be48a81717865237e9e0ccdb6def91a4d7f52319773f0a04b31db0b6bcf90a4457355414e62cfb6595511a6679525a66
-DIST linuxx86-21.9.0.25.tar.gz 139524584 BLAKE2B e8854b2a363b7d15b490f97239d6a4af9e5bd32fa70e7884b5f23ccba9b072d74e7d4d11b39b1eb252e3d0d37ed8450f105e864f0b17f42f1ee1a47723b444e0 SHA512 326109d17142aa633a64afd1ed5972ae7fec3182e3d8bed74ce93a0fba9db3c86a6c73831d2b9c4a1424ad885f2462289786dd7a92ea23c429560c700be89416
-DIST linuxx86-22.3.0.24.tar.gz 143073253 BLAKE2B dab19b4ff0192687a33c385327d799cf5eb59cb5f75ae47246b4ddd124246e60179ab5503ff05f18c79b97194ecd6d71324834a443a92c0c7ac58d55a368bcf6 SHA512 5f79be72a626501ae857e13efcd46a8371ee8a402d3fe45b8caa2bd07e92e81240909d849969c738a262f1698c0810f4065ac7b37888df772a9042fe70d3eca7
-EBUILD icaclient-21.8.0.40.ebuild 5421 BLAKE2B a416182e9e9f4769f8b0b9dd53580c6201e9d1107e5f07deb3b7b319ac1883b55681b5c566b3fa829c1c467a74cf0406e801b719e4e675e1562ab63bd178355a SHA512 7226655750edc699a8e2b15c5db1f2495d641e2d9aaddaeb936e4ac67d7e30e6f50c365efe088314e7dcc331c72d694a3b42bea456463e52a06aa7b01fa86c7e
-EBUILD icaclient-21.9.0.25.ebuild 5423 BLAKE2B d37f73eb66df4202d38cf60479a2b0ce8cdcb594ec3f2a772d6e047ffd9ecf8b56a2d011d2cc3949eff9622502d4972f58340377912227cddcd8d0c9da4956c2 SHA512 3caa23fbbdcd778268b73a452170477c98445e98700f8ae6f23929a1a74b55bf440f9c4a9d3876b452ee5bcca70e05e468c3f6f0187dbc75561e291c50ca81c1
-EBUILD icaclient-22.3.0.24.ebuild 5423 BLAKE2B 72240f902964eac02b50d9c327d2edfa180dccbfd6ea5e5bea528a7273c406e6fee3326965d1774ba36dc0fe7c81f584de4d2feeabf1942a9ef4b2bc02af18dc SHA512 1e8a492128ab5e4a1f7be899ff18866427e459d6fd4b512d49ed9540f0b82e20173f3e6d9e510e92c85c314d6e8802463fcf33e54fb7f45def3bd1eb605ea7fc
-MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
+DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
+DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
+EBUILD icaclient-22.5.0.16.ebuild 5447 BLAKE2B 5bda643f7f078b7f07b2d3ab0a11a0f43ae5d0632a8250ec0eddae5f7df1ed8ec4bc7e709733989b86059190a806a6e4555cb8148eb2dc85154f0378dd2d9ed9 SHA512 0505b48016b8b1f465daf348bedefe5937b150127fbed1132be62df1dda558c2f86cbfc66070100fc7c19b16d6a10f465e20b25cd23f15e689b60926d13f18d7
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-misc/icaclient/icaclient-21.8.0.40.ebuild b/net-misc/icaclient/icaclient-21.8.0.40.ebuild
deleted file mode 100644
index 770400a17a47..000000000000
--- a/net-misc/icaclient/icaclient-21.8.0.40.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
-RESTRICT="mirror strip userpriv fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	sys-libs/libcxx
-	sys-libs/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-DEPEND=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-
-	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	# We need to avoid module.ini file getting added to the package's
-	# content because media-plugins/hdx-realtime-media-engine modifies
-	# this file on installation. See pkg_postinst()
-	mv nls/en/module.ini "${T}" || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	if use amd64 ; then
-		rm lib/ctxjpeg_fb_8.so || die
-	fi
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	# nls/en/*.ini is being handled by pkg_postinst()
-	doins config/* config/.*
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	local util_files=(
-		configmgr
-		conncenter
-		ctx_app_bind
-		ctx_rehash
-		ctxlogd
-		ctxwebhelper
-		gst_play1.0
-		gst_read1.0
-		hdxcheck.sh
-		icalicense.sh
-		libgstflatstm1.0.so
-		lurdump
-		new_store
-		nslaunch
-		setlog
-		storebrowse
-		sunraymac.sh
-		webcontainer
-		what
-		xcapture
-	)
-
-	exeinto "${ICAROOT}"/util
-	for bin in ${util_files[@]} ; do
-		doexe util/${bin}
-	done
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	local inidest="${BROOT}${ICAROOT}/config"
-	if [[ ! -e "${inidest}"/module.ini ]] ; then
-		mv "${T}"/module.ini "${inidest}/" \
-			|| ewarn 'Failed to install plugin.ini file'
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/icaclient/icaclient-21.9.0.25.ebuild b/net-misc/icaclient/icaclient-21.9.0.25.ebuild
deleted file mode 100644
index e408e2f73c82..000000000000
--- a/net-misc/icaclient/icaclient-21.9.0.25.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
-RESTRICT="mirror strip userpriv fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	sys-libs/libcxx
-	sys-libs/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-DEPEND=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-
-	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	# We need to avoid module.ini file getting added to the package's
-	# content because media-plugins/hdx-realtime-media-engine modifies
-	# this file on installation. See pkg_postinst()
-	mv nls/en/module.ini "${T}" || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	if use amd64 ; then
-		rm lib/ctxjpeg_fb_8.so || die
-	fi
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	# nls/en/*.ini is being handled by pkg_postinst()
-	doins config/* config/.*
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	local util_files=(
-		configmgr
-		conncenter
-		ctx_app_bind
-		ctx_rehash
-		ctxlogd
-		ctxwebhelper
-		gst_play1.0
-		gst_read1.0
-		hdxcheck.sh
-		icalicense.sh
-		libgstflatstm1.0.so
-		lurdump
-		new_store
-		nslaunch
-		setlog
-		storebrowse
-		sunraymac.sh
-		webcontainer
-		what
-		xcapture
-	)
-
-	exeinto "${ICAROOT}"/util
-	for bin in ${util_files[@]} ; do
-		doexe util/${bin}
-	done
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	local inidest="${BROOT}${ICAROOT}/config"
-	if [[ ! -e "${inidest}"/module.ini ]] ; then
-		mv "${T}"/module.ini "${inidest}/" \
-			|| ewarn 'Failed to install plugin.ini file'
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/icaclient/icaclient-22.3.0.24.ebuild b/net-misc/icaclient/icaclient-22.5.0.16.ebuild
index c6fed4ed5d78..ed272b4e5416 100644
--- a/net-misc/icaclient/icaclient-22.3.0.24.ebuild
+++ b/net-misc/icaclient/icaclient-22.5.0.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop wrapper xdg-utils
 
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -181,12 +181,14 @@ src_install() {
 	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
 	local util_files=(
+		HdxRtcEngine
 		configmgr
 		conncenter
 		ctx_app_bind
 		ctx_rehash
 		ctxlogd
 		ctxwebhelper
+		echo_cmd
 		gst_play1.0
 		gst_read1.0
 		hdxcheck.sh
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index 99e2666c588b..115e9d64a669 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 45786094052f..197749e5ac8c 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -6,4 +6,4 @@ AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552c
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
 EBUILD icecast-2.4.4-r1.ebuild 1995 BLAKE2B 825d6521954e6e25ffe2ced0f800083a584b44e8d881d87e97ceaa5f06afb70347d2487adf392acd8230db5a9f90230d5dbf53a14764e3f98e95c37e4eb5295f SHA512 1acab0291bc85849bb15938ec1bcaa0670f88f3e125f59f720ca34f6aa6dff1bd8321690ee1d474e32a6b6bb5b90f8ece24b7837359cf6b09fb603686c3ddb25
-MISC metadata.xml 423 BLAKE2B 08ad58b6362d7be4815fd133c715f8eecbb93bb6246277e6682cbeca62c2f01c3d8582afe009297faf650d099330bd79f666194a660b5b31c98fabf5a66e3269 SHA512 99301ee201d3f2d985e32047024a9aaf2ebc8ddbf46b4f599f343a6961112455268dcda62e5a8bc24d2ec2fa105a4ec4fae26e3fb72bd74578ca761960f3b732
+MISC metadata.xml 339 BLAKE2B 2388fa1ded6bc009746dc408ae5bc24f7d3486ab03cc8728689bea58abeb4322960bc6d8ab9a9ffa11f3d2fe78f4e81354b95432da1f5151e1c7fa712c8f4f2d SHA512 d71612d5fc3dc22e8650a41fadddebe663760fb5f29a7e284e879936d9419a1ea4ae186957b72108eb86daa30ab565f69dfd553525bcce457e2db33c5127941b
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index 658dba18610e..b70d2da8b605 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
 		<flag name="yp">Build support for yp public directory listings</flag>
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
index 9d50026d4d95..c429780c8d6c 100644
--- a/net-misc/ip-sentinel/Manifest
+++ b/net-misc/ip-sentinel/Manifest
@@ -3,5 +3,5 @@ AUX ip-sentinel.cfg 278 BLAKE2B bf582820bb9a22a0cb3e5b82ae934697c77d9f777e31ae1b
 AUX ip-sentinel.conf.d 357 BLAKE2B a8f08e6c63e4b1413f9021985086a573c4691c70f3d2f7447e0f23a4bfc80253b32971fff473e7ca1c71ee1f7bed192d2e8cd1ca01385153d156dc4bb1a25e7d SHA512 c35614e812cc0b3caea671cf2703493030f6de96f8b5afc80455c93f3e6181ddaf7eb6c22d8b63244f219b506db4bddfdf9792bf89ec17d7c56d274d003d4506
 AUX ip-sentinel.init 1047 BLAKE2B 3073e1145b94e93b08400a06ed7a0f0ba4a7d11bd996f4daaf3e27ca857dd2b5c74d30e644ebdc3a5fa1911ef378d3a9306a011d293f5d46d25f989c5f3ac44d SHA512 89729f42d31a81902e957e67089c0e3ead7f8e8f9554ef787bd6c05f210f231d56812a5dcf56d5be58c360dd31fa38873dfa17d1ae0423a80d1e93055853ed75
 DIST ip-sentinel-0.12.tar.bz2 165803 BLAKE2B 5b77dc771c432ddb556cc30cc9fce4226fed47958930cad4364af63146f8feeb5177542bccecbd276161acaa2232315022a59b8b83ba7763523886b4cb82b364 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077
-EBUILD ip-sentinel-0.12-r2.ebuild 2144 BLAKE2B a30287f1ab38cee2d4f353644cae1d9b160bcf5eafb7c7e0df2c27b1f7f4c50ffcafde662ee48bc735a1cdddc4edede172c4f8233761af8b828f4b4aec9044d6 SHA512 7b4fbb37bcb9f541a389def64766a5b76e87f7ae22a93dde1fcbc0249827c2ea84a8b1285f051a37d3970af79acb985c7d1e7b06e66557c163c87278d89db450
+EBUILD ip-sentinel-0.12-r2.ebuild 2148 BLAKE2B ce439c67e1e2e17d64a17e8f8e0b0913fb39ee7c82570b92a33827bbb455e381be907ed5ddd153306e20927302c46fd84338f87e54bacb34e4d90f23abd690cc SHA512 13d48e7baaf31df43aafec75f26d79b776ba2b906bf73e47ef689660220edb508acbabc34b68f42f00af77660f4f983098c1d3a2486dc18ef6f8751328a847cc
 MISC metadata.xml 1304 BLAKE2B e11f7fcb7d77ad093f00c4f782ba66010af5c835d61a63436217b77dbbcd90e9b58107448fa370bdb98ecd949c4fe4dc5076dd30f628e315eab999e1fdf9a0a5 SHA512 05b998cb343cea66dc3e727b0536fff7eafe0306d1ba46eaee07515e582debaf6085dfefd4298141074a0d368aa6c7228f52b97a527f9629f5aaeab22c3b7c8e
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
index 44c2ea9d4979..1a50de532bad 100644
--- a/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,10 +40,9 @@ pkg_config() {
 	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null`
 
 	if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then
-		ebegin "Setting up the chroot directory"
-			mkdir -m 0755 -p "${CHROOT}/etc"
-			cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc"
-		eend
+		einfo "Setting up the chroot directory"
+		mkdir -m 0755 -p "${CHROOT}/etc" || die
+		cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc" || die
 
 		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then
 			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 6ae36e6c2b6a..f4186ff28ace 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,10 +1,5 @@
-AUX iputils-20210722-fix-no-ipv6-ping.patch 2038 BLAKE2B ac403da299a9e407482396c1fb232bc16d388aec0f53954214ba9af982fb37f60140c179bd6a547a079bca63a9a9ccf1f0660ec6bee184a5db544959df94b103 SHA512 3d2bcc77d7e3cc433bdf9d7d84deb1471b6860167dbc0b0937b688762a183c7e8da5285a5c8fb09252322511601133721148f06edc64ee6f3e8f741d02182851
-AUX iputils-20210722-optional-tests.patch 5276 BLAKE2B c485d39b06916acdaaec6f98ffeb718afbfd630af7220c7dfb408855a8862c2b121bbf4482621f633b86f1b94df78afc54157d99f2ff28cff833ae263aae5e78 SHA512 59d7ff881c03d7c03f5f41d2015f03175456487d9802999173f4705b3cfd7819957258e68a0b932fd9901f418bca866252d4a673d66f08b9e179a07ae84e8c40
-DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328
 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
-DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
-EBUILD iputils-20210722-r1.ebuild 4479 BLAKE2B 750d9f2d727712cf18dbe0ba57c3a00778550ef3c6acbed220c49d9f3b5923b8f17571fcf711419c849aadef9f8068306f1bfc5df01d1a1930ddd1fc334a2021 SHA512 35a603440b190972fa0738384415d7ed5ebaa086a3edf5d33521aeb1cf1a9c1725257721a0ff866e1d4ae1c2b32c40c229e9c0147c4df62954727f26a8039053
-EBUILD iputils-20211215.ebuild 4762 BLAKE2B bc353f7d10c4881bb7424c7828db70d2a574cb21ec572cab9e769ba18c87ac3fb27a084589d495c9c2822c1eb0aeafc241b33071f5521c631bdac8748429173d SHA512 db0d6efba7bb58258935b4962f613be358abe3be9869dd03638406c3110eb25d62a7b67af2271a91c5acc09766e818a73f45ce9297c9848843ab643ee9ccc5bc
+EBUILD iputils-20211215.ebuild 4754 BLAKE2B f5e6b11dcf1642695fb3fe8be537a5df04359d397c28f7a86fff5b11c8dc37743597df22721d41bdd8c45f3f06f76325c236e3159602b15bc8cd1200d3389c41 SHA512 aa0565d5645f4acba4bfa3ca6d425e2538922ec9f3405ba1f4542941e7f21f5399e8709b71d76292a927109911226cdaa2be56ad63b62006e59a759556747bd5
 EBUILD iputils-99999999.ebuild 4256 BLAKE2B b58c87e7b56ca6f0b5127153ec1d8d551d6bbbbf2d609ad654bab0cab556f0875af0be11b76067c3b4cabe76d1b545dfad65549ffcc061cd019feeb45e2edb6c SHA512 e775320e5759ef38f20fdccdfc4a6b7713fc8fb466b976697dc1315b5770cd44a08f4e75d86ab3a4b5f465a3ef53b0742d878ce871b69e443aba5be373711d89
-MISC metadata.xml 1351 BLAKE2B fadee46aec2d000027cd23e6eb442bca0077635fe98ae847e37c5848dffabef28950e54df9e6e86b49ec18630ec2e305975a5a04575a9246b86f9504c61f18aa SHA512 fac4af2402993b203cbc225c54f905e63334ef714fcddbeaa56d95963fa13d5be308b0b2030b6c74719596deed4cdfb50c668698b6acf493b2bf964c3df85251
+MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch
deleted file mode 100644
index 61f9f5c03fd6..000000000000
--- a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/iputils/iputils/commit/79d713eab6181e219bf932b404706f6f59ff2539.patch
-https://bugs.gentoo.org/818022
-
-From: Byron Stanoszek <gandalf@winds.org>
-Date: Thu, 16 Sep 2021 23:38:54 +0200
-Subject: [PATCH] ping: Remove 'unsupported IPv6' warning on disabled IPv6
-
-Regression was introduced in d141cb6 as introduced condition
-
-if ((errno == EAFNOSUPPORT && socktype == AF_INET6) || options & F_VERBOSE || requisite)
-
-was wrong, it should have been:
-
-if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || options & F_VERBOSE)
-
-but bug was hidden as `family == AF_INET6' was always false until
-otherwise correct fix 904cdb6 ("ping: AF_INET6 is address family not
-socket type [lgtm scan]") propagated the error.
-
-Tested on kernel booted with ipv6.disable=1 (disabling via sysctl, i.e.
-sysctl -w net.ipv6.conf.all.disable_ipv6=1; sysctl -w net.ipv6.conf.default.disable_ipv6=1
-does not trigger the issue as it exit with "socket: Address family not
-supported by protocol" - errno EADDRNOTAVAIL).
-
-Fixes: d141cb6 ("ping: work with older kernels that don't support ping sockets")
-Closes: https://github.com/iputils/iputils/issues/293
-Closes: https://github.com/iputils/iputils/pull/370
-
-Reported-by: lekto <lekto@o2.pl>
-Reviewed-by: Andrew Clayton <andrew@digital-domain.net>
-Reviewed-by: Petr Vorel <pvorel@suse.cz>
-Signed-off-by: Byron Stanoszek <gandalf@winds.org>
-[ pvorel: create commit from Byron's patch on the issue, do analysis and wrote commit message ]
-Signed-off-by: Petr Vorel <pvorel@suse.cz>
---- a/ping/ping.c
-+++ b/ping/ping.c
-@@ -150,8 +150,8 @@ static void create_socket(struct ping_rts *rts, socket_st *sock, int family,
- 		/* Report error related to disabled IPv6 only when IPv6 also failed or in
- 		 * verbose mode. Report other errors always.
- 		 */
--		if ((errno == EAFNOSUPPORT && family == AF_INET6) ||
--		    rts->opt_verbose || requisite)
-+		if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) ||
-+		    rts->opt_verbose)
- 			error(0, errno, "socket");
- 		if (requisite)
- 			exit(2);
diff --git a/net-misc/iputils/files/iputils-20210722-optional-tests.patch b/net-misc/iputils/files/iputils-20210722-optional-tests.patch
deleted file mode 100644
index d6c4e98c0800..000000000000
--- a/net-misc/iputils/files/iputils-20210722-optional-tests.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-https://github.com/iputils/iputils/commit/3163c49f9f4ad473a00d8a345ee334a028376011.patch
-https://bugs.gentoo.org/807973
-
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 23 Jul 2021 16:32:46 +0200
-Subject: [PATCH] meson: Make tests optional
-
-Now can be disabled with -DSKIP_TESTS=true.
-
-It allows to avoid meson error during build when ip isn't installed.
-
-Closes: #359
-
-Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
-Signed-off-by: Heiko Becker <heirecka@exherbo.org>
-[ pvorel: Rename variable TEST => SKIP_TESTS, default false, adjust
-the description ]
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -72,3 +72,6 @@ option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false,
- 
- option('USE_GETTEXT', type: 'boolean', value: true,
- 	description: 'Enable I18N')
-+
-+option('SKIP_TESTS', type: 'boolean', value: false,
-+	description: 'Skip tests during build')
---- a/ping/meson.build
-+++ b/ping/meson.build
-@@ -27,86 +27,6 @@ if (setcap_ping)
- 	)
- endif
- 
--##### TESTS #####
--
--# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_"
--
--# GitHub CI does not have working IPv6
--# https://github.com/actions/virtual-environments/issues/668
--ipv6_dst = []
--ipv6_switch = []
--r = run_command('ip', '-6', 'a')
--if r.stdout().strip().contains('::1')
--  message('IPv6 enabled')
--  ipv6_dst = [ '::1' ]
--  ipv6_switch = [ '-6' ]
--else
--  message('WARNING: IPv6 disabled')
-+if not get_option('SKIP_TESTS')
-+	subdir('test')
- endif
--
--run_as_root = false
--r = run_command('id', '-u')
--if r.stdout().strip().to_int() == 0
--  message('running as root')
--  run_as_root = true
--else
--  message('running as normal user')
--endif
--
--foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
--  foreach switch : [ '', '-4' ] + ipv6_switch
--	args = [ '-c1', dst ]
--	should_fail = false
--
--	if switch != ''
--	  args = [switch] + args
--	  if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1')
--		 should_fail = true
--	  endif
--	endif
--
--	name = 'ping ' + ' '.join(args)
--	test(name, ping, args : args, should_fail : should_fail)
--  endforeach
--endforeach
--
--ping_tests_opt = [
--  [ '-c1' ],
--  [ '-c5', '-i0.1' ],
--  [ '-c1', '-I', 'lo' ],
--  [ '-c1', '-w1' ],
--  [ '-c1', '-W1' ],
--  [ '-c1', '-W1.1' ],
--]
--foreach dst : [ '127.0.0.1' ] + ipv6_dst
--  foreach args : ping_tests_opt
--	args += [ dst ]
--	name = 'ping ' + ' '.join(args)
--	test(name, ping, args : args)
--  endforeach
--endforeach
--
--ping_tests_opt_fail = [
--  [ '-c1.1' ],
--  [ '-I', 'nonexisting' ],
--  [ '-w0.1' ],
--  [ '-w0,1' ],
--]
--foreach dst : [ '127.0.0.1' ] + ipv6_dst
--  foreach args : ping_tests_opt_fail
--	args += [ dst ]
--	name = 'ping ' + ' '.join(args)
--	test(name, ping, args : args, should_fail : true)
--  endforeach
--endforeach
--
--ping_tests_user_fail = [
--  [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root
--]
--foreach dst : [ '127.0.0.1' ] + ipv6_dst
--  foreach args : ping_tests_user_fail
--	args += [ dst ]
--	name = 'ping ' + ' '.join(args)
--	test(name, ping, args : args, should_fail : not run_as_root)
--  endforeach
--endforeach
---- /dev/null
-+++ b/ping/test/meson.build
-@@ -0,0 +1,81 @@
-+# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_"
-+
-+# GitHub CI does not have working IPv6
-+# https://github.com/actions/virtual-environments/issues/668
-+ipv6_dst = []
-+ipv6_switch = []
-+r = run_command('ip', '-6', 'a')
-+if r.stdout().strip().contains('::1')
-+  message('IPv6 enabled')
-+  ipv6_dst = [ '::1' ]
-+  ipv6_switch = [ '-6' ]
-+else
-+  message('WARNING: IPv6 disabled')
-+endif
-+
-+run_as_root = false
-+r = run_command('id', '-u')
-+if r.stdout().strip().to_int() == 0
-+  message('running as root')
-+  run_as_root = true
-+else
-+  message('running as normal user')
-+endif
-+
-+foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
-+  foreach switch : [ '', '-4' ] + ipv6_switch
-+	args = [ '-c1', dst ]
-+	should_fail = false
-+
-+	if switch != ''
-+	  args = [switch] + args
-+	  if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1')
-+		 should_fail = true
-+	  endif
-+	endif
-+
-+	name = 'ping ' + ' '.join(args)
-+	test(name, ping, args : args, should_fail : should_fail)
-+  endforeach
-+endforeach
-+
-+ping_tests_opt = [
-+  [ '-c1' ],
-+  [ '-c5', '-i0.1' ],
-+  [ '-c1', '-I', 'lo' ],
-+  [ '-c1', '-w1' ],
-+  [ '-c1', '-W1' ],
-+  [ '-c1', '-W1.1' ],
-+]
-+foreach dst : [ '127.0.0.1' ] + ipv6_dst
-+  foreach args : ping_tests_opt
-+	args += [ dst ]
-+	name = 'ping ' + ' '.join(args)
-+	test(name, ping, args : args)
-+  endforeach
-+endforeach
-+
-+ping_tests_opt_fail = [
-+  [ '-c1.1' ],
-+  [ '-I', 'nonexisting' ],
-+  [ '-w0.1' ],
-+  [ '-w0,1' ],
-+]
-+foreach dst : [ '127.0.0.1' ] + ipv6_dst
-+  foreach args : ping_tests_opt_fail
-+	args += [ dst ]
-+	name = 'ping ' + ' '.join(args)
-+	test(name, ping, args : args, should_fail : true)
-+  endforeach
-+endforeach
-+
-+ping_tests_user_fail = [
-+  [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root
-+]
-+foreach dst : [ '127.0.0.1' ] + ipv6_dst
-+  foreach args : ping_tests_user_fail
-+	args += [ dst ]
-+	name = 'ping ' + ' '.join(args)
-+	test(name, ping, args : args, should_fail : not run_as_root)
-+  endforeach
-+endforeach
diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild
deleted file mode 100644
index a97324cae332..000000000000
--- a/net-misc/iputils/iputils-20210722-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces dependencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag, all USE flags enabled and
-# tar ${S}/doc folder.
-
-EAPI="7"
-
-PLOCALES="de fr ja pt_BR tr uk zh_CN"
-
-inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc idn nls rarpd rdisc static test tftpd tracepath traceroute6"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( sys-apps/iproute2 )
-	nls? ( sys-devel/gettext )
-"
-
-LIB_DEPEND="
-	caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	nls? ( virtual/libintl[static-libs(+)] )
-"
-
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	static? ( ${LIB_DEPEND} )
-"
-
-if [[ ${PV} == "99999999" ]] ; then
-	BDEPEND+="
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-ns-stylesheets
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
-	"
-fi
-
-PATCHES=(
-	# Upstream; drop on bump
-	"${FILESDIR}"/${P}-optional-tests.patch
-	# Upstream; drop on bump
-	"${FILESDIR}"/${P}-fix-no-ipv6-ping.patch
-)
-
-src_prepare() {
-	default
-
-	plocale_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local emesonargs=(
-		-DUSE_CAP="$(usex caps true false)"
-		-DUSE_IDN="$(usex idn true false)"
-		-DBUILD_ARPING="$(usex arping true false)"
-		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
-		-DBUILD_PING="true"
-		-DBUILD_RARPD="$(usex rarpd true false)"
-		-DBUILD_RDISC="$(usex rdisc true false)"
-		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-		-DBUILD_TFTPD="$(usex tftpd true false)"
-		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
-		-DBUILD_NINFOD="false"
-		-DNINFOD_MESSAGES="false"
-		-DNO_SETCAP_OR_SUID="true"
-		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
-		-DUSE_GETTEXT="$(usex nls true false)"
-		$(meson_use !test SKIP_TESTS)
-	)
-
-	if [[ "${PV}" == 99999999 ]] ; then
-		emesonargs+=(
-			-DBUILD_HTML_MANS="$(usex doc true false)"
-			-DBUILD_MANS="true"
-		)
-	else
-		emesonargs+=(
-			-DBUILD_HTML_MANS="false"
-			-DBUILD_MANS="false"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	tc-export CC
-	meson_src_compile
-}
-
-src_test() {
-	if [[ ${EUID} != 0 ]]; then
-		einfo "Tests require root privileges; Skipping ..."
-		return
-	fi
-
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	dodir /bin
-	local my_bin
-	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
-	done
-	dosym ping /bin/ping4
-	dosym ping /bin/ping6
-
-	if use tracepath ; then
-		dosym tracepath /usr/bin/tracepath4
-		dosym tracepath /usr/bin/tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if [[ "${PV}" != 99999999 ]] ; then
-		local -a man_pages
-		local -a html_man_pages
-
-		while IFS= read -r -u 3 -d $'\0' my_bin
-		do
-			my_bin=$(basename "${my_bin}")
-			[[ -z "${my_bin}" ]] && continue
-
-			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
-				man_pages+=( ${my_bin}.8 )
-			fi
-
-			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
-				html_man_pages+=( ${my_bin}.html )
-			fi
-		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-
-		pushd doc &>/dev/null || die
-		doman "${man_pages[@]}"
-		if use doc ; then
-			docinto html
-			dodoc "${html_man_pages[@]}"
-		fi
-		popd &>/dev/null || die
-	else
-		if use doc ; then
-			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild
index 74d10298e9c0..9adbec78252c 100644
--- a/net-misc/iputils/iputils-20211215.ebuild
+++ b/net-misc/iputils/iputils-20211215.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index cd78568cc221..ae5bf52a8768 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <use>
-    <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
-    <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
-    <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
-    <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
-    <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
-    <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
-    <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
-    <remote-id type="github">iputils/iputils</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
+		<flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
+		<flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
+		<flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
+		<flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
+		<remote-id type="github">iputils/iputils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 3df12d0d3b34..b9d21ae396f5 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -3,8 +3,10 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
 DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195
 DIST ipv6calc-4.0.0.tar.gz 1682616 BLAKE2B 5a26f6c4c8a9a2ea49c8762690c18e523ebde370817e71ae56f1cda211324695f046e85bba56f0b19e17869d72adb0ee8739fdbd4e8c4503d4a286107212eda4 SHA512 939dfcbe68c6e110acfe23f6f221471bda03ad165f5785bbc9aabd03b3192ab3cdb99df458db79edfa3c3d2f3202f1f2f189b7a9fd9a5ae27a7084de2fbd907d
+DIST ipv6calc-4.0.1.tar.gz 1705407 BLAKE2B 599573570df946f3362e213e481b8016b037de6263ed53aa61fd39b69810b2cf05a9c76408904bac4b076a4061091be8adbd6d5648a1f5bdc5d021ebd5123acb SHA512 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce
 EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
 EBUILD ipv6calc-3.1.1.ebuild 1531 BLAKE2B 6ec62ec4b7b14c5ac33672c35b2699f02d1c0d07e71c3718cbfdeb3b5c577bd8897c2803239c600edaa580c8b472bf932855b63c3af607de16fd7edb446a90dd SHA512 85189a0d6df24ae0c09369ea7a0a1fb567c77bee782443f633fff509fc874101fed583cb0991c59e55c4e5138449ba30874134a3ededb64264c60ad914e3809d
 EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
-EBUILD ipv6calc-4.0.0-r1.ebuild 1613 BLAKE2B b6bbd14d11e19626c53770eb2244643f5987f480cbacf6a057c5044a88314617632091141d06ac9dfe57e7ba6e0bd157ad03fae6a7a3b642dd01c71cddd651f7 SHA512 33fcb942c8d3017400e65a094ac322cfba6758a6724abf018acfe81618648de7b05b85d34633b245c3c324a74a9c505fb3dffbe3c644b3325f32106c367c5535
+EBUILD ipv6calc-4.0.0.ebuild 1613 BLAKE2B b6257c007601fe976a9ac89ea80d282b0425139490e6e3f426b0942a90a9e5c80e61017976ee6e97e2fbd5abb92a08b3be6d0966d04e01b949c5cf74f0bbfbe8 SHA512 302fbdce9435dbf1042d1561ef03738ed3b9a870280679e182c5308df99c13898825f7c83add111587551afe534e7e8f9431509b21a66314e2bd571c4cd59292
+EBUILD ipv6calc-4.0.1.ebuild 1651 BLAKE2B 5ba62fe0ff17a6fefb84c9e2b37251b9fd76a75a1cd42a9a5bd74223b1bdb641600a7ef2de11a440b0a219fd21a172e8fa8eb29224e99eeddedd81848cc4d696 SHA512 d850a4ee003e032c5b55d504c8ea155b10d1b76a2186e20b1c114295f3194578f9aa9fa1884e229971e1cf655c4b244575983e800650e2adb542cd9a4919fdd2
 MISC metadata.xml 335 BLAKE2B 80a2b9fa130b3475f0045dc1626eb166078e1f091632013bcb48af829da11ab8f8c6fa61e107ddf1636eac2282493d370eb639669383f7f00e56cbbdb8ce5028 SHA512 a95df3df487415da7ba079eb8de0466bda61770e128761b8d8a9158aac7b22727287d2f35ba7bc6ad00c2e80037892dac6c9e2ce7ad1beec2bc9b2329e14688c
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.0-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild
index a5d7e8e70ae5..3aa11efa4dd8 100644
--- a/net-misc/ipv6calc/ipv6calc-4.0.0-r1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
new file mode 100644
index 000000000000..084598853945
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cgi geoip test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	cgi? (
+		dev-perl/URI
+		dev-perl/Digest-SHA1
+	)
+	dev-libs/openssl:=
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	local myeconfargs=(
+		--disable-compiler-warning-to-error
+		--disable-bundled-getopt
+		--disable-bundled-md5
+		--enable-shared
+		--enable-dynamic-load
+		--enable-db-ieee
+		--enable-db-ipv4
+		--enable-db-ipv6
+		--disable-dbip
+		--disable-dbip2
+		--disable-external
+		--disable-ip2location
+		--enable-openssl-evp-md5
+		--enable-openssl-md5
+		$(use_enable geoip)
+		$(use_enable cgi mod_ipv6calc )
+	)
+
+	if use geoip; then
+		myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake distclean
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 4ff0ba20e472..09649c04860c 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -4,9 +4,13 @@ AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f25142
 DIST kafka_2.13-2.8.1.tgz 71438574 BLAKE2B 51969ae472665f5716f0ee9df35d627221d1347ea0ddcbc0812774606c3c8251670a7f79eaf93eb3141494042f967e9eeca14ae078937afb6bc29c2ef57bd68c SHA512 91fcd1061247ad0ddb63fa2b5c0251ee0e58e60cc9e1a3ebe2e84e9a31872448a36622dd15868de2c6d3f7e26020a8c61477bc764e2fb6776a25e4344eb8892d
 DIST kafka_2.13-3.0.1.tgz 86512293 BLAKE2B d1d1a1c4e0ae68a6d30fc36df1e796e55576345f6533027cbe0a1130f9148ea6fb0a3dea5e38a6fd22c8ced87cfee2e62969264a51aefc3d41d982a9020087a3 SHA512 d949fa4be7b601a9b482ae1c7861135a5da007362c4c1c9c218bdca94c45e918527e56738361aedc6b6dfb7abf02b1aa8110c7bc622cc2379b8a2ee557e5756f
 DIST kafka_2.13-3.1.0.tgz 88130011 BLAKE2B 1dbd0f0cbc54ee19c47acff6aa25b4867e25fde81239a7b5e2f8ef6f42a727e041c006457964e48caec95cc8dc0b4ccc0f391b67264bcf27a61b9111e707fc2b SHA512 5954c1cf38187134a6e0a21520cbef5cd5320a3e9290e630c3895990e892219917d911fabbc64da5db17bcaa940b8277c23344b50f2ff4256eaca78116e9fdc9
+DIST kafka_2.13-3.1.1.tgz 88034707 BLAKE2B 7704f951808a4b8ae68ece37816a408891287da692f065aab6d1fa0a85908f1ff166fd8b03df832dca132d276dcbaabadc33c400a43e38c7116c42cdb89d6adf SHA512 5ec72ee76ad14997763f2654ecef0390fd9628413c287619b734f44193252950d412deba684aae5147ac844a88d9ef10eefc0ffeb14435f2e00347ef946aa5d6
+DIST kafka_2.13-3.2.0.tgz 103955943 BLAKE2B 048837f489b30912999991af0f27a7804d83f15b5c0895aaaa36b72970776dbb91b215b5ced3c7435aac993bf7c9eb7fc8e2709511edb8fbf6d270f2d1bb7145 SHA512 736a129823b058dc10788d0893bde47b6f39b9e4972f9eac2d5c9e85e51e477344c6f1e1ebd126ce34d5fd430eb07e55fdd60d60cb541f1d48655c0ebc0a4778
 EBUILD kafka-bin-2.8.1.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
 EBUILD kafka-bin-3.0.1-r1.ebuild 2089 BLAKE2B 10c29ea27f428f22bd16184aa124fa19a4af2771e7b85c98610611c43c6ad47678ecfa63830ab1e02a57a53eb074fa9b08cdc506f36c85acfe8f74039cd8ea28 SHA512 bdd213c2323f91d5e4de57153ce5a5ade6df9c77fd8dcf22db52d75be4ec80765cb4e540afe8d455e0385703385ff3bcc0c26b1e6f8547b00a9704742ad499a6
 EBUILD kafka-bin-3.0.1.ebuild 2067 BLAKE2B e711e94deefb0d7ea590cf9732401c7659938a28e7367cfcb419a3da1ca1ef706da7a82471e4a89e81c7b7d5871c730af4d17e48c6c19e8d29831e18ad9e2177 SHA512 a1243a3309bf30c32a2c227b6351f3e294f209557308b49cefa1d9aab1e36d69105ea9f8411c48e92583d6d92e3dababaa72bba3c969688c9adad819d03005ef
 EBUILD kafka-bin-3.1.0-r1.ebuild 2089 BLAKE2B 10c29ea27f428f22bd16184aa124fa19a4af2771e7b85c98610611c43c6ad47678ecfa63830ab1e02a57a53eb074fa9b08cdc506f36c85acfe8f74039cd8ea28 SHA512 bdd213c2323f91d5e4de57153ce5a5ade6df9c77fd8dcf22db52d75be4ec80765cb4e540afe8d455e0385703385ff3bcc0c26b1e6f8547b00a9704742ad499a6
 EBUILD kafka-bin-3.1.0.ebuild 2067 BLAKE2B e711e94deefb0d7ea590cf9732401c7659938a28e7367cfcb419a3da1ca1ef706da7a82471e4a89e81c7b7d5871c730af4d17e48c6c19e8d29831e18ad9e2177 SHA512 a1243a3309bf30c32a2c227b6351f3e294f209557308b49cefa1d9aab1e36d69105ea9f8411c48e92583d6d92e3dababaa72bba3c969688c9adad819d03005ef
+EBUILD kafka-bin-3.1.1.ebuild 2065 BLAKE2B ab15c04ecfc4bcf7e58f1e3c47127a7636f40c158608d411245d5b2991d996f38393f163fdab4c010365fb290f85dfd8fdd7c8c9d6f20bd7d7e5fb378c90d745 SHA512 2a54d19e09421b9ddac5a33a6d65c4a0300184d5e913b07373469ddf8ac4f4538e27aeeaaacab263cf31af55b4352596780f712c3d18ff4a74fc8bcf7b5a7030
+EBUILD kafka-bin-3.2.0.ebuild 2065 BLAKE2B ab15c04ecfc4bcf7e58f1e3c47127a7636f40c158608d411245d5b2991d996f38393f163fdab4c010365fb290f85dfd8fdd7c8c9d6f20bd7d7e5fb378c90d745 SHA512 2a54d19e09421b9ddac5a33a6d65c4a0300184d5e913b07373469ddf8ac4f4538e27aeeaaacab263cf31af55b4352596780f712c3d18ff4a74fc8bcf7b5a7030
 MISC metadata.xml 390 BLAKE2B b381ee7c8449c21b4036052e12f2442e1480e9790df1e42ac5375dbb13c7c9344e8d2b2f9b80bc75fdafdd023d6a80c2149151233ee7d2908539ef9d998e7445 SHA512 fe9f241db7f81e850901a8d3b7c2d90f043d3b80851132359055e855c9b1c949566aab4a3889b5af56db99e9f18000e40b4f9096221a9bf813ac5e82bb88bf7e
diff --git a/net-misc/kafka-bin/kafka-bin-3.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.1.1.ebuild
new file mode 100644
index 000000000000..313f507f0bdf
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-3.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="https://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.13
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper connect"
+
+COMMON_DEPEND="acct-group/kafka
+	acct-user/kafka
+	virtual/jre:="
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+	sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+
+		ewarn "Zookeeper owner has been changed to kafka:kafka"
+		ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper"
+		ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper"
+		ewarn "to keep the previous behavior."
+		ewarn "All logs files have been move to /var/log/kafka/"
+	fi
+
+	if use "connect"; then
+		doins config/connect-distributed.properties config/connect-standalone.properties
+		newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-3.2.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.2.0.ebuild
new file mode 100644
index 000000000000..313f507f0bdf
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-3.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="https://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.13
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper connect"
+
+COMMON_DEPEND="acct-group/kafka
+	acct-user/kafka
+	virtual/jre:="
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+	sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+
+		ewarn "Zookeeper owner has been changed to kafka:kafka"
+		ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper"
+		ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper"
+		ewarn "to keep the previous behavior."
+		ewarn "All logs files have been move to /var/log/kafka/"
+	fi
+
+	if use "connect"; then
+		doins config/connect-distributed.properties config/connect-standalone.properties
+		newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 58acb905ae6b..55fd5b41f710 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -14,9 +14,8 @@ AUX kea-dhcp6.conf 19710 BLAKE2B 3ce2b18b7b8402cdb98e247db3942314083c8b18c508fbe
 AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 AUX kea.tmpfiles.conf 61 BLAKE2B a0c31118e028dfbbdb372866b85f99e7b2b73a88bb1c2f27ebe5bb0ff19a77c96b13bb5ddc581af366c8bd104322eef196d849f8a333ca0c9eaffbce980c9443 SHA512 8a155fef71c89dda45b2920bdc62c6ec79946b5f7ba126a9627e35b62b8b283356a8be4a378aa33ff1f103ac608d6460fcd170baa3f097914d398e763a3a6d9e
 DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
-DIST kea-1.9.11.tar.gz 9739770 BLAKE2B 0215ac48036506018dc869c313d59244e4bf03634be279039fd0dbf7de73a2d87654b11153ec9014b89c815068961633987d44a26b820e4692937c85d29d352c SHA512 5d7739d74b6fbed9733719af1aa068498fcc1eaa1ed423b93b9b4dd92de970e3cd036ad60377534a58e7d22e909404673358fa72307b6c32492f952684c180c0
+DIST kea-2.0.2.tar.gz 9796557 BLAKE2B a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad SHA512 edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83
 EBUILD kea-1.8.2-r1.ebuild 2785 BLAKE2B 3726d139e9c04da6c3a345a8665dfa1530a525e6ec7b468c9601f5ab11bb26fa5cee845576b5ca617bc19473b6d4d3f403f23395c3b0662c97080a5bb3593f57 SHA512 b9b921c004baad4a8936ee9e97da876b32b8909b1dd81d886c7a7a28528e9aab84d6e30b46631dc7ae58ed18f243d04f4fba62e8313a1932b18ad1b3aaff339a
-EBUILD kea-1.8.2.ebuild 1805 BLAKE2B e3d5971e48a4d1bfc4bb4525dd29a3e9fe773e2e9276966b377f5ed8bdfb5892e5d1a334c16ce9c79735610d802d346ec1da69543eb0daace3dabbec40ddfd0d SHA512 1d6fd14954a0c88f5050f4764a592ec6dd17cb6970413b183e29896842cf2970178766ec29d05e05a8913264984db0da88d4685b709576f8988e97fdd3d4390b
-EBUILD kea-1.9.11.ebuild 2733 BLAKE2B d727f315595048996d91c29648d84469f60fd2f0bf4fbbc157b8f64aa307ac794cca76c9a79c1acb1b49f77b289b859ead86c412e344ad812230f1e083ba890e SHA512 f9f1e15b21fe9ae8b8223fa91d45f18fd66e986daafbac62d5305b3b19534752cded898cb5a017daeda772ac77657cf723b68a85f9728e6e1c600995e47838da
-EBUILD kea-9999.ebuild 2510 BLAKE2B 642706b5298a0936fd21cf3d8a05d097d90955f87552d6f46f0193044d4f800cd608c91720a5649e108c71b692b4f648eec4a8392fc6d93da0126134443e06f7 SHA512 1cf24522f19a398eff9537fe362621a18693fcfcfdd14d99e76d9717fb028cffc94c4a07e75c17d9a47852432f8d0643983c788a03bc8289e14c1743f508e72d
-MISC metadata.xml 785 BLAKE2B effb1866745b2c4d1db59f41586c240455aabb707a606fe083503d847a90846ef304c96cd69d3153c133946a1b90978e97db9fead9776b2cf8a6a735a60eba9a SHA512 e026c4948bf1c5f05cc3ffb475f4336e80e179ea7e71af11bdb37e9951514497a9b9a516bf24736b43f8462cd5abd8a59cd6c03a7ba0583c25df89557c24e8f4
+EBUILD kea-2.0.2.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477
+EBUILD kea-9999.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477
+MISC metadata.xml 760 BLAKE2B def46b553ea484e8c8ebb887fbaa45f30b65b4607b6dbc269540e19e7edac2dd152b6b724f666a2e920b7c7e7269b0e60a08ad46f5e8131b5135950c678d2144 SHA512 308b7461e94919cc2b5ec0627bd63292b874eae91e7520465264fa5c2187085afdfe9c95fddf68265eea49ad38b5cd0e3426982234d191ccbbb4c0161c36a7c9
diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild
deleted file mode 100644
index 7bf6f71daf2a..000000000000
--- a/net-misc/kea/kea-1.8.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="https://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	inherit autotools
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql +openssl postgres samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:2= )
-	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}
-	acct-group/dhcp
-	acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch
-	"${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-perfdhcp
-		--localstatedir="${EPREFIX}/var"
-		--without-werror
-		$(use_with mysql)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_enable samples install-configurations)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
-	keepdir /var/lib/${PN} /var/log
-	rm -rf "${ED}"/var/run || die
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/net-misc/kea/kea-1.9.11.ebuild b/net-misc/kea/kea-2.0.2.ebuild
index cec8274fa82c..aca4fe99e606 100644
--- a/net-misc/kea/kea-1.9.11.ebuild
+++ b/net-misc/kea/kea-2.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
@@ -10,7 +10,9 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="https://www.isc.org/kea/"
 
-inherit autotools systemd tmpfiles
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools fcaps python-single-r1 systemd tmpfiles
 
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
@@ -18,13 +20,16 @@ if [[ ${PV} = 9999* ]] ; then
 else
 	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	# Odd minor version = development release
+	if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then
+		[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
 fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql +openssl postgres +samples test"
+IUSE="mysql +openssl postgres +samples shell test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -33,7 +38,9 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )"
+	postgres? ( dev-db/postgresql:* )
+	shell? ( ${PYTHON_DEPS} )
+"
 DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
@@ -42,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/dhcp"
 BDEPEND="virtual/pkgconfig"
 
+REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )"
+
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
@@ -49,11 +58,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.10-gtest.patch
 )
 
+pkg_setup() {
+	use shell && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	# Brand the version with Gentoo
 	sed -i \
-		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@lists.isc.org)/g" \
+		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \
 		configure.ac || die
 
 	sed -i \
@@ -67,14 +80,16 @@ src_configure() {
 	local myeconfargs=(
 		--disable-install-configurations
 		--disable-static
+		--enable-generate-messages
 		--enable-perfdhcp
 		--localstatedir="${EPREFIX}/var"
 		--runstatedir="${EPREFIX}/run"
 		--without-werror
+		$(use_enable test gtest)
+		$(use_enable shell)
 		$(use_with mysql)
 		$(use_with openssl)
 		$(use_with postgres pgsql)
-		$(use_enable test gtest)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -108,4 +123,5 @@ src_install() {
 
 pkg_postinst() {
 	tmpfiles_process ${PN}.conf
+	fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6}
 }
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 9f241b088227..aca4fe99e606 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
@@ -10,7 +10,9 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="https://www.isc.org/kea/"
 
-inherit autotools systemd tmpfiles
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools fcaps python-single-r1 systemd tmpfiles
 
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
@@ -18,34 +20,53 @@ if [[ ${PV} = 9999* ]] ; then
 else
 	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	# Odd minor version = development release
+	if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then
+		[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
 fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql +openssl postgres +samples"
+IUSE="mysql +openssl postgres +samples shell test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cplus
 	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
 	postgres? ( dev-db/postgresql:* )
+	shell? ( ${PYTHON_DEPS} )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}
 	acct-group/dhcp
 	acct-user/dhcp"
 BDEPEND="virtual/pkgconfig"
 
+REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )"
+
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch
+	"${FILESDIR}"/${PN}-1.9.10-gtest.patch
+)
+
+pkg_setup() {
+	use shell && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	# Brand the version with Gentoo
 	sed -i \
-		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@lists.isc.org)/g" \
+		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \
 		configure.ac || die
 
 	sed -i \
@@ -59,10 +80,13 @@ src_configure() {
 	local myeconfargs=(
 		--disable-install-configurations
 		--disable-static
+		--enable-generate-messages
 		--enable-perfdhcp
 		--localstatedir="${EPREFIX}/var"
 		--runstatedir="${EPREFIX}/run"
 		--without-werror
+		$(use_enable test gtest)
+		$(use_enable shell)
 		$(use_with mysql)
 		$(use_with openssl)
 		$(use_with postgres pgsql)
@@ -99,4 +123,5 @@ src_install() {
 
 pkg_postinst() {
 	tmpfiles_process ${PN}.conf
+	fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6}
 }
diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index c1a041003281..4ca6f0a579ca 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/metadata.xml
@@ -2,16 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>expeditioneer@gentoo.org</email>
 		<name>Dennis Lamm</name>
 	</maintainer>
 	<use>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>dev-libs/botan</pkg></flag>
 		<flag name="samples">Install sample configuration files</flag>
+		<flag name="shell">Install kea-shell text management client for Control Agent</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://gitlab.isc.org/isc-projects/kea/-/issues</bugs-to>
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 83245c34552c..b4ea269fbdf4 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -10,6 +10,7 @@ DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e8488
 DIST lldpd-1.0.11.tar.gz 1962748 BLAKE2B 13b6efe44a7dd0f9ec681ec5ef96358ca01c500f0238460ce633b59a1506d9caf405baf3ac910be9baa5840f3751b9d9e0bda127c96083f012eb4af75ba7b9e9 SHA512 2433c81d892b8f8f43c4a897eedfde6fff41db8514fc212bd60b71d080b963b12346017f554657d5abe6d0f02256cf49c9f8b82c8e402763ad0a5c53d459ac32
 DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2ee5f1c5b9f68a68890f6e74e7cac52bcb0aefad68b8bcade9eacd18f6aa783eec4a71e895adc173ddd2a554322 SHA512 893add53c814d904894dd768ea2e412f288bd7767090fb9b5f686ce3fed65a436ed1365039e5d7f8ef8f5ae9206800b087c71515caa16d1d375389dd7558050f
 DIST lldpd-1.0.13.tar.gz 1973988 BLAKE2B ad22d6f19e566886fda1b879e2ac39c59a0cf061e17df404f0cc68504453517a438d1bb0ac2350b7ba3cafb53ae0996deace93918a6af1043aebff5bf3720fad SHA512 b78440622882a822c9114c3617323ac3c8ce759040bb5b8a9f7357ca20e2993ab0130ee9ad85f65d5f38996665d599d70bbb9dd202e2557035e98545a4304aef
+DIST lldpd-1.0.14.tar.gz 1979314 BLAKE2B 9e4dc2126eb07b09e42da07c1ddff9fd02a306404c45632cc80eb791e05cf07c0919a57fca2b91c6302ec01447213ed7f1b5a5bb14482b1f9c3a1fc501a0fdcb SHA512 268d85144fd06c70c9394acdbd92478b0ee3426beed76e48363f71e329681c57ab6bb1d7b313011e1243eeaaeb2b1f35085641bd86d6894c7d998d030d84b548
 DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
 DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
 EBUILD lldpd-1.0.10-r1.ebuild 2311 BLAKE2B 54ebbd6fa93b90572a24d0bb5a79cfe42c4b7946e12449cd84d26d26d4f4e5ed9a71f186bf38810cb3e9965dba1c3f16b2c753826eed5dcc1bfbf2374260b937 SHA512 b6e337bf3ae7895ab85831c4ecccb3a454cfdd4975c06ad764bc24c2beff9d82abf8d3876cd4a14479a8b39857f68b08b09843ab287f19c35a56d745ca375c6e
@@ -17,6 +18,7 @@ EBUILD lldpd-1.0.11-r1.ebuild 2309 BLAKE2B 96dc221542a8e7e1e963d17f0b594d6b445b4
 EBUILD lldpd-1.0.12-r1.ebuild 2310 BLAKE2B e1aa76d0ad4886f042e2693fa7369371577101da54ff83aabfffa1a5cbc9e1f63368828bac0ba6bda43316b9694775ca738522a3c73bfd1b406cb2e2b9df86cf SHA512 158316ed020cc53a28007cc8da54313f04beb44d0604b8888fc46f9edd09b685b942e0b6dfd7d7159ec85aab6e76f50aeed09a56bb2ab614fd29db81cd0ed41e
 EBUILD lldpd-1.0.13-r1.ebuild 2334 BLAKE2B 51420942c3e86cebc71709ca90bedc91059d8484587687860586e4fd9ca4008c773012f892da2e95e4ae0113759b16c26def29974cbde9f2c785e556307dcb79 SHA512 d2bed42d041b46cb80e67abfe1da1f28602660ee7216a9c760c2634288df70218f621d20fe469400d889019cad145d89fe8895e2be9de41f616b93d0f6de7eea
 EBUILD lldpd-1.0.13-r2.ebuild 2383 BLAKE2B 49d8736aa06b028d811b36b8b19677ef856b0e4789cb1f6d8e0b7fba079ed9108303115f81f82d29ffbdfade3c12285bbead31413c42f8bf59b13a570e9fe8c8 SHA512 76a778aaa7193f2131c926cafdff38ea3e463c7ba53b65023dfecb792f3fe337a87987b7189090fcddb5c989bcdce4262ceb6d31b24f2bd744d5429c45585f8a
+EBUILD lldpd-1.0.14.ebuild 2240 BLAKE2B 30d837a4de010adf7533d0fb684a2f2ff8b6af36be43978a9df5afbda85f2424e8b9c0feefffc45cce75d9c8c169a93497bcc597ec3017c45a23f598d9485900 SHA512 f576d9d55400310b60afb0c0e1d50da7595f1324566fdd8acb3e13e382adb028fe90acac1e103207212cdcba7af117edc05223b7c1cd175e18178e7f542c122c
 EBUILD lldpd-1.0.7-r1.ebuild 2251 BLAKE2B 9777f9464d1386495b161073d45ec5ee4619aa86d34b13f03b9a69327974d377ea119ccf3a04df81f301605e057ac9737b573de63cbf56a44b4f142f74df035f SHA512 1f8669155bd57ed0517f7cbee62d67a36eb2b57a9425484a4a8a7b75314f5d3f23263fa0a4184d6e40e2698dcc4d7d10a1202773a01e332eb52502bac09cb191
 EBUILD lldpd-1.0.9-r1.ebuild 2253 BLAKE2B 137bfb67a1480bc6e8a9e20f6cc44426348e3546d12c865c141a24e6f0494c0398d79f63c050377ed876700c07ef25b75643fce15d58139b7411d39bcbf4468a SHA512 e7038541d2e784f44d849a6e4b9157904dd69db63b8492e4998ec3cfa9409844fe34b61aee0ea74ef9419769da0a66fbba6c259a4321a687375f03dffdb4c168
 MISC metadata.xml 2769 BLAKE2B 0e26b610c20744dafbe488e868e76ecb5b8540f1ad519952db8bd9586df14f6ae6ca0af66af443b5846861842351774013d03212b454fb488b2ee0788c2f424a SHA512 dc50bb275f32bae3d4ed6bba7007502c632c07f8f33876c211e52d159a62cc927ff263dae8f00c948e2ce10f88140b1a0fb970201c2cd2604a879147defabe12
diff --git a/net-misc/lldpd/lldpd-1.0.14.ebuild b/net-misc/lldpd/lldpd-1.0.14.ebuild
new file mode 100644
index 000000000000..7d7e1e61ff12
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.14.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/lyricwikia/Manifest b/net-misc/lyricwikia/Manifest
index 322b6f53f91f..aae7f30feae2 100644
--- a/net-misc/lyricwikia/Manifest
+++ b/net-misc/lyricwikia/Manifest
@@ -1,4 +1,4 @@
 AUX lyricwikia-0.1.11-skip-online-test.patch 506 BLAKE2B 92bf9826dd35d483fdabae057884e36847e2be273e668adae281962ec26ec05338b5fe53debb01655136af6a1325a20d043f023e756ee674c876c40d08095915 SHA512 6bb6d2960c39bee05e1d5b3a01656d78bce4fe07038758029274cf7e4d8495a29ffd2b79a7f3e02902a5e73fce03b505d1fed48a75e3681ab004a95cd6466416
 DIST lyricwikia-0.1.11.tar.gz 5571 BLAKE2B 1e2fb5400b4c0ed07d419e577e3c12c6b8eca749ce1a5b7dea51d6d055979722b82d003eac20402da873d3011d1b444c0783935adbc01ec99dd6079b234e6bc7 SHA512 53ff9a2837ccc10be62c2a92240e9849a9c88b7979f8058deff87ce6eda6e98e39fb86c78052de9a885db679cd87a6c5749af2f9502d3316fbbf2c0796718805
-EBUILD lyricwikia-0.1.11-r1.ebuild 1318 BLAKE2B 4d5d0bc26a1b46ab317d14279dee1d947b66dce6486a2639b06c086ba840f208cf862691e28abd3c08703eb203ca24c97f3690e6d0049e3f53d85e496de2fc7d SHA512 1163a15b4aaf3c2039f0d2d59f84562b71e493744c9fb1d6ac20f8f16632e654994cac4fe7c1981a5383f58f322f9e56236acf4f1503e5c0ce4b98fb62dbab97
+EBUILD lyricwikia-0.1.11-r1.ebuild 1318 BLAKE2B 2242ec9dec4334cfb22045a4489793238a2bb5158c7b589b704f7b271987d577a1a2bd698db76f7ea320356e75a4250cdd4a3194552b445543831b727c428f67 SHA512 56be6d8c763411f0b4fcb72e00e0c2ce085c6bd2aa05d53abaace8969a5807a8d1c27ae12a369c87a4bc4da447e337506efa19ee6eea7ae2ec836a0eb5cd6c08
 MISC metadata.xml 284 BLAKE2B 6ea63280a95dc3b6ebb3a35ce1f2de07164e12774246db1f4117fa0d70dbd903633a24240fa1475a93b87610068c84cb52360037cd8d1dad231b1738e6bfcca2 SHA512 53b66619d17399f0d78bcc6586d0cbed9edc88d0f815822b1bd55dd3dcf85b4c0fae6bb377a060d1a188016eaac9af14e0eb7003aae47a74ce4ac14839cfc07f
diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
index e50cdd4ab9ec..103fdcd54626 100644
--- a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
+++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index 243f044f5932..52e6bb77079a 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,3 +1,5 @@
 DIST megatools-1.10.3.tar.gz 196361 BLAKE2B 49d7658714074253ab93134bd9fbb6f73a9101e362f219c4394cfe599deeb3cb2ccf01afb89db75691299271fa9dbfdf004abd6dfe26d2a0fda783282561ff51 SHA512 cf431e151f3f7e1a77fcfe07092694f861eca43ab88bb4e0d4de72f01662e9140c51891f8f5cf3cf66d3a04b64a55d57fd766c3febf2fc5cee1720558ff2079b
+DIST megatools-1.11.0.20220519.tar.gz 105567 BLAKE2B 2f878568bb21a554d15bf6d68dfe27b8ba3d10cd9a4645e6082473e911940a0500d7becd0e4e7a72404f60759aaaaa5cb2780c6b176f722fb4fd57269570f4e2 SHA512 5c379a5a8da150d6d95a84f6bcf0c9be5b725c2c0e799e8d1e3358ac6081579eacc853f6b3d369c06006d3bdb3917dc20cf39ca5c69f153dc38de9daab74cea1
 EBUILD megatools-1.10.3.ebuild 713 BLAKE2B 8241d9fbb52a77bc00a8f0b689060068df781200fd679b74ff74302a29c22774ee1cbbedeadee7990c85d4cb982b37815f28dafd36d831a108dba094d97f34ca SHA512 3fe92ee1388e6ed190b8f5eeb183967be92fe3264ca9ab43fde43ccefea6e0aab821fa327a0f743bca6b0a61d7009e8ae430a35e876cab281d7d1b76a5d94091
+EBUILD megatools-1.11.0.ebuild 656 BLAKE2B e73292ca248cc5393e174f1919c32a19bdc2256ae54cc826dcc54f41e317e8dc9d49db78d6429cba3b0121e10361e018134a45be247d69223dc0bd46b31f67d0 SHA512 e35e66bad1272cd6623a63d0d109c882103cd36bb4bbf864cadaf59a9bf32e0283c546092cd4ee2e08130b25fb94a8941f3baa0ac02ea89b40eb6a55418d6e49
 MISC metadata.xml 539 BLAKE2B 70a4c81ac41274519e398a405996a5792864088c215203b95b92a067cd63767416eb7ec2ea2b5a1af39761353ce50b533c6c6127eab1ad80f687d92666de7655 SHA512 36b93e4ff68d73d24f5d3e4397b32a58c542f2b8049ef9aaeaf0392a656803c3bf4bb70bfbdcc48fba07130fa54d0693014fbba5550905f0bc2831a204e62afc
diff --git a/net-misc/megatools/megatools-1.11.0.ebuild b/net-misc/megatools/megatools-1.11.0.ebuild
new file mode 100644
index 000000000000..e9edcdae3798
--- /dev/null
+++ b/net-misc/megatools/megatools-1.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+MY_P="${P}.20220519"
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://megatools.megous.com"
+SRC_URI="https://megatools.megous.com/builds/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/openssl:0=
+	net-libs/glib-networking[ssl]
+	net-misc/curl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_install() {
+	meson_src_install
+
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index f4802b62cb97..64522be3b3b2 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -3,4 +3,4 @@ AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f
 DIST miniupnpd-2.3.0.tar.gz 256069 BLAKE2B dd21b4ee692cf9958bd996c6fe70e7e1f6cdfe467506676d2335ccf37cd0ed7e55ff435983747cad5d2342019b36597e538fcb9b511872889305330212e88cb0 SHA512 437a4b101bcadd9feb3845d37402c253a0a2114463fd8c5930859c7eae0ffaf7714ef7c9d387be2339c584e2f106fafa008a4364ff347b6640153c9a09919b0a
 DIST miniupnpd-2.3.0.tar.gz.sig 543 BLAKE2B 312d46521d37c1a2fda146f2c7c964af45ffa4a75bc327dc743b40f96586e0916a674db4a0bb847b5e386f0b781319868d1d6cc74fbffaf3a8e989db18f4f6e6 SHA512 87be539c27d0147fcc62b69a82858518e862f2b593a0e03a9986e3641a0d61f4fa831d79a7ce645b33569234463a9517b9dbbc79ee988c9f561474a4757c4c04
 EBUILD miniupnpd-2.3.0-r1.ebuild 2306 BLAKE2B 25d3069c8b96a167d77608c6da46edb4016b1cb2f92a0275ceac123923d2d3d4cb767a7f276b616cfdc31c22b6c30fbdaeddbe130456ebf5a71328f36e54018c SHA512 10718574779b011469ede70cda63994e7f443690e66501725b7f366be67623c1deaa65db402f420d7c412cfd9e8424b286dd5a662d502403f6840aa5e951d262
-MISC metadata.xml 903 BLAKE2B 08e36f0ed04a8314bcd5edab87303883dc2dfe454b4ab427bf8f1716922f20465c61971dae2eb95381783589b202b4480f98c0d1f01fb2e7cc8e2a72ee9a294c SHA512 3b253a010b5f5e683c6cd4b60d9e8ef3a1bf6c85856ea18bbb2d97a610af7ca1bfbf0d62096044d3c851067b5203359d1768a58eafe6d06ad48a36013839d811
+MISC metadata.xml 985 BLAKE2B 4df9a4cf573d7aa45b80bc5062682325c3e063fd4b6147164dcc2a4e1b859def25df4541e1859c8843153c9de3a74557a3b66c94b69a65a94162752e177a907e SHA512 2068b103e2804c899ab17f63ae0aaf46442252067d6a8c12e7cc94c0b8760f5d764cf4124be78079236611cd05d7c5016b1b08499d1c265c561193344dfdeba6
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index 37183016068f..e1c5b875f102 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/metadata.xml
@@ -17,4 +17,7 @@
 		<flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
 		<flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">miniupnp/miniupnp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 4a788511ba9f..b71a915c894a 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,7 +1,5 @@
-DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356
 DIST mobile-broadband-provider-info-20220315.tar.xz 84068 BLAKE2B 69b1805cdac393d733c7c4bd033f623d01260abe9be97108b1f7525a1e96935dd6b6582cd647e415a4f6329988cc105a220fbd3672b0d8c719e298ac53e0bcac SHA512 92da9e03f48d1a3e5807cab616627d0d31539dfee5c9650f78c5eb4371748366700ffe26f922ac061f877cd1bd5c3fb766e71fea0677eee007e68873c39c597c
 DIST mobile-broadband-provider-info-20220511.tar.xz 85064 BLAKE2B 7abb1d493cc39b9988a188edf260b5440bc8cb9e0879897df550ee63cb46c52721ee75dee304bbc93add3173a7ff56bd17bccf8dd062590ae583cee67e9093ab SHA512 7b3a9c0a2e618ef3ef0e29b947ab9f0a55f30bd738f0e976529e8f3ddbb60a738f623e718ea67fa6e6008275dbbe78ce3ed9852c005748a266f04e3dd65179a6
-EBUILD mobile-broadband-provider-info-20210805.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
-EBUILD mobile-broadband-provider-info-20220315.ebuild 488 BLAKE2B 53964ee3d58e66980dde3d952e25295a648fe86b48693ecd13c59be8c999bc349ec55cf893887a898b2be0b05c81994b07161b8870efadb9c4a296202c2eb247 SHA512 58f291acd42c78dfaddde0f3d96ccab717710dae8f35ccd373bab5a564d1b62eb98cc3348a7f55ad5d7baa12c3c172ddb855f913c29fe734c9c7571b7f4d9bfb
-EBUILD mobile-broadband-provider-info-20220511.ebuild 488 BLAKE2B 53964ee3d58e66980dde3d952e25295a648fe86b48693ecd13c59be8c999bc349ec55cf893887a898b2be0b05c81994b07161b8870efadb9c4a296202c2eb247 SHA512 58f291acd42c78dfaddde0f3d96ccab717710dae8f35ccd373bab5a564d1b62eb98cc3348a7f55ad5d7baa12c3c172ddb855f913c29fe734c9c7571b7f4d9bfb
+EBUILD mobile-broadband-provider-info-20220315.ebuild 481 BLAKE2B 639e3a145dd1fe761073f041ce2fb920e82c8161a4c1c983fadaa8336971e3d1d54f3bf4f327140c2ee3a1f216dba2472ba335a943316642dc0ae46e16c5942b SHA512 747a29260d627457108ec78b0262850cd4bd5b9e397dbb6f50249180115e7e9bd9eefc2fbda961bd17053413dc99571e24020e2569e335ec345b8e3e8d884d1a
+EBUILD mobile-broadband-provider-info-20220511.ebuild 495 BLAKE2B 965640686d3108a286e6532ac320e4dd31dfeeaa193fee9c39be04c6820db7a03f7b9ca123a761aa42669f0efed99998ff0f7deac1c23fa033caac11e137a778 SHA512 728c18ba169f3e451f02dae6d69db50c3a12337ec6c4dd054472c74ffa6a1ad693d565f159244121373a479e0b893a1fe696218bbbfc45b53c5aba208c873701
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
deleted file mode 100644
index 0da3e23ad4bb..000000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org
-
-DESCRIPTION="Database of mobile broadband service providers"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
-
-LICENSE="CC-PD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( dev-libs/libxml2 )
-"
-
-DOCS=( README )
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
index d0704be34ed8..25252b03f4f6 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
index d0704be34ed8..c7d2788a09a8 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index e1cacea302c3..09dbab131df3 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,7 +1,7 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
-DIST ModemManager-1.18.6.tar.xz 2519572 BLAKE2B 022e461d43a10bfce8d97f39b855cd28e1d165d07ec65db15c4ec3e89d932829b8c88a1834d182bc966c22f0d848cb6bb06bae2cc2930f685c9fa43b277668d9 SHA512 3b154d459e1196494d7f99303f88088215992aadb57a8cc66f838b068e762fa3d25f19a597922c26a138f670e1da46d627de11cf41d83ce96b3197a086f8e91b
+DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b
 DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c
-EBUILD modemmanager-1.18.6.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6
-EBUILD modemmanager-1.18.8.ebuild 4003 BLAKE2B d800093327f92efb25a1fcdd4950af83bc1381d9635f6ca6fdd62b215dd1051d35f76de0d6bab201c3354f2f9e3d29154e06b61e8e1b83772229843612f3d9ea SHA512 539908220d8ea7ebf96772e08d2dbc6bdfabe9f6284d84b8de49dc2786c6d81ad8e87c25910bae2122e8cc06a97385a6856f1470bbb5d7389b645600e56608c0
-MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee
+EBUILD modemmanager-1.18.10-r1.ebuild 4118 BLAKE2B 03257b54e6dffc1173cc13ca13567acf7c5be6d85460f74a36b7b96b749b728b77be13062b8e58d0fc08939934f6f0c3d300b2df26060669f0ebd43dd672ae36 SHA512 cd382fbe17bc683d930bd3b8397fcaafbf4c75059c9d7392350195368bf967664b662350258932b0ba2603eb42fdf63a9936fd37e877613783c18071e88bc72e
+EBUILD modemmanager-1.18.8.ebuild 4030 BLAKE2B 9ee5f4baa98a5a28b09b2b663a283c6af93fd7c51c6518bff6bb287cfc3ca081cc2a4169b0427d6ecb0298607b8661598f930e9aed66108205400fdf251acb63 SHA512 dd4971c173bf32e59434a427ed904888fee2ec098c7ae3e046c019411d1d23792d6ce37db6569e2060307ff94b7e846b764fe47b93f3bfb83fc25184d917ca80
+MISC metadata.xml 522 BLAKE2B 9a2c3612abbf39e1518eac9eb5d1be220a11c81c0612c876779caced0a00c282a5a571cf19a1ab174accd2c22c071e69b16336cc0e93e45c1b3903a4013ac242 SHA512 2539c9975be03c6b365bdf32353529469dc3fece4f4df7d31784d8e5299126d813bb6a310c4fefba5e81d2db5aa073446ef4697c059a2eac7efe1502a6671a4f
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 44a1c20ee048..97718f935bb7 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="mbim">Enable MBIM modem protocol</flag>
 		<flag name="qmi">Enable support for the QMI modem protocol used by
 			devices with Qualcomm chipsets</flag>
+		<flag name="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/modemmanager/modemmanager-1.18.6.ebuild b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
index 0b3fef8057f3..9b2baf49b464 100644
--- a/net-misc/modemmanager/modemmanager-1.18.6.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
@@ -11,11 +11,12 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala"
+IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala"
 REQUIRED_USE="
 	?? ( elogind systemd )
+	qrtr? ( qmi )
 	vala? ( introspection )
 "
 RESTRICT="!test? ( test )"
@@ -26,7 +27,8 @@ DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	mbim? ( >=net-libs/libmbim-1.26.0 )
 	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
-	qmi? ( >=net-libs/libqmi-1.30.2:= )
+	qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
 	elogind? ( sys-auth/elogind )
 	systemd? ( >=sys-apps/systemd-209 )
 "
@@ -71,7 +73,7 @@ src_prepare() {
 			add your user account to the 'plugdev' group."
 	fi
 
-	use vala && vala_src_prepare
+	use vala && vala_setup
 	gnome2_src_prepare
 }
 
@@ -87,7 +89,7 @@ src_configure() {
 		$(use_with policykit polkit)
 		$(use_with systemd systemd-journal)
 		$(use_with qmi)
-		--without-qrtr # libqrtr-glib not packaged
+		$(use_with qrtr)
 		$(use_enable vala)
 	)
 	if use systemd || use elogind; then
@@ -139,7 +141,13 @@ pkg_postinst() {
 		ewarn "about your modem port manually."
 	fi
 
+	use udev && udev_reload
+
 	systemd_reenable ModemManager.service
 
 	readme.gentoo_print_elog
 }
+
+pkg_postrm() {
+	use udev && udev_reload
+}
diff --git a/net-misc/modemmanager/modemmanager-1.18.8.ebuild b/net-misc/modemmanager/modemmanager-1.18.8.ebuild
index a86bab79aa95..6ed05d4bf7f3 100644
--- a/net-misc/modemmanager/modemmanager-1.18.8.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala"
 REQUIRED_USE="
@@ -139,6 +139,8 @@ pkg_postinst() {
 		ewarn "about your modem port manually."
 	fi
 
+	use udev && udev_reload
+
 	systemd_reenable ModemManager.service
 
 	readme.gentoo_print_elog
diff --git a/net-misc/mptcpd/Manifest b/net-misc/mptcpd/Manifest
index 616c95796f1a..1e9a7ced30be 100644
--- a/net-misc/mptcpd/Manifest
+++ b/net-misc/mptcpd/Manifest
@@ -1,5 +1,5 @@
-AUX mptcpd-0.9-loopback-monitoring.patch 6941 BLAKE2B f3798b5da940266cad94093e0ab16c93546ac62923b94f947ffdefea89b864776ef668d6359c6a7b7f5f675b05dd4d55f73ea55f632fb209eb12b99c8f585975 SHA512 cf3cc223d46ad568b25c5bb9c583ad388d558242956692328c9582d11c73e69d2acc58661607b9ec44b71abc5265f6171529d34b21cabf5f16c313bf05d2a7a6
-DIST mptcpd-0.9.tar.gz 654063 BLAKE2B fd9e8bf5cec517c934b9d38a736a128d087b54b5e4db90816a8cf8c242195fec8e3c4cd28d2f6e5a93326cac311a6b29048313c722004cea39e19448dc467976 SHA512 4fd292304d6270351b865e86cc401c1f5cc9043606b171e852bd37b2472c5f80061d760be68e5cd965caccb2f25c03d9ceea6232a5a587016c81f85e68ca8882
-EBUILD mptcpd-0.9.ebuild 1161 BLAKE2B 1cbefb7a16d7bcfb267e5c40ca708fd5908e6a9e214671419950b63f2012a80617c537a4d5eb4f4d2d4c82f5b53cfaf2d5c595f4a6aadb566fad0bb11da4c736 SHA512 d7449fcd0eb50db970a7174624250c8f4b743a967c8a9f058063a01e6915d56586991228204445f630edce0743a1879576734e782ad73d971cafd7590ff0b40a
-EBUILD mptcpd-9999.ebuild 1103 BLAKE2B 629897a77071480b8516bc646df0852838a88fe8122581ba13ff178691e3311dc9927d78502d7bb415fd506eb435887ff4b348f8a53d24b04966e9812eb381f8 SHA512 f9c005fbad040d994458e7c8cd9b64f929368de5f7d2ee7abc5f2d84deb944228d04966820c71bb01c42940001e8dc5e5110b268b9be8f9eefa9d33ed80403b0
+AUX mptcpd-0.9-no-werror.patch 810 BLAKE2B 49e0b2900529a64d9078d2838eb7039f3b733094d8f12f1cd6b36fed89f1b9d3929ae7f3b26eb2ed0a162e06b3a8248deaa4a23e6506dea3ed20a3175fc6fff9 SHA512 c3e082253960ca740d90a2e97dc5a73405ce8bb7aec7909f3a1c7deb837fe47e4b900127525f95fcd8648d4bb08c2b9ed2656b876b93d5f09ad280d31afc0fdc
+DIST mptcpd-0.10.tar.gz 671508 BLAKE2B de29050b5394b4011bf2bc25ce7ca33c42da8332e10d89c849047508886080e43e0e4f734e77437f8b0122336b47aa4f6442c07461e4552183cf10b08dfb6d81 SHA512 758dd9c84446abab7a26e6e7fa19fedb6ab4a8dbb8d6e2535f3eae5b9b423becaec9a18aea214498b424d110227af7eafb630b91b963eb5be2da0da936fd3a93
+EBUILD mptcpd-0.10-r1.ebuild 1224 BLAKE2B a81fc6341fcde5e4a2f2fd31aec4a51b7bdf7280fd5471f69acece74d21455ca21244a46a4835807399fcd7408b5d5834b39cf96e1077942ac470f83e18b6794 SHA512 bcbf211cb9d101b9a9941c39c662c6d13c3ef58ac08fd664a0b789b6229fea9eaa0ea755ef0e85747c156e32b8097a40363087b4310a70246299521f07a80114
+EBUILD mptcpd-9999.ebuild 1224 BLAKE2B a81fc6341fcde5e4a2f2fd31aec4a51b7bdf7280fd5471f69acece74d21455ca21244a46a4835807399fcd7408b5d5834b39cf96e1077942ac470f83e18b6794 SHA512 bcbf211cb9d101b9a9941c39c662c6d13c3ef58ac08fd664a0b789b6229fea9eaa0ea755ef0e85747c156e32b8097a40363087b4310a70246299521f07a80114
 MISC metadata.xml 326 BLAKE2B 77d6f17ab473dfbdd5d156b8c6020ba80cf49d95fc9693c88b6f6a5f2a9449cc0caa53ba000183a4fba747d7e298b77528346c680049ea28fa86b9c308da0a34 SHA512 1150bc86b2b12c042e0de7eab7701808a703bd0a42e5a38eac94e07131f3138ee6c010644fd1837ef6240e1c83cf51553f8f99fd03970a2f84252aeee7e76f06
diff --git a/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch b/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch
deleted file mode 100644
index 38061a754a4d..000000000000
--- a/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From a200ef26e4daf0347dd8f1bd35d49dd66fba7a7e Mon Sep 17 00:00:00 2001
-From: Ossama Othman <ossama.othman@intel.com>
-Date: Thu, 17 Feb 2022 16:39:59 -0800
-Subject: [PATCH] Allow loopback network interface monitoring. (#220)
-
-* network_monitor: Allow loopback monitoring.
-
-Add a new mptcpd_nm_monitor_loopback() function that allows the user
-to enable monitoring of loopback network interfaces.  Monitoring of
-loopback network interfaces is meant primarily for testing purposes.
-Mptcpd will retain the previous behavior of only monitoring
-non-loopback network interfaces by default.
-
-* tests: Enable loopback interface monitoring.
-
-Enable loopback network interface monitoring to allow the
-test-network-monitor unit test to succeed in cases where non-loopback
-interfaces are unavailable, such as in a sandboxed environment.
-
-Fixes #208.
-
-Co-authored-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
----
- include/mptcpd/network_monitor.h | 21 ++++++++++++++++++
- lib/network_monitor.c            | 38 +++++++++++++++++++++-----------
- tests/test-network-monitor.c     | 15 +++++++++----
- 3 files changed, 57 insertions(+), 17 deletions(-)
-
-diff --git a/include/mptcpd/network_monitor.h b/include/mptcpd/network_monitor.h
-index dc35e3d..ea1a95b 100644
---- a/include/mptcpd/network_monitor.h
-+++ b/include/mptcpd/network_monitor.h
-@@ -213,6 +213,27 @@ MPTCPD_API bool mptcpd_nm_register_ops(struct mptcpd_nm *nm,
-                                        struct mptcpd_nm_ops const *ops,
-                                        void *user_data);
- 
-+/**
-+ * @brief Enable monitoring of the loopback network interface.
-+ *
-+ * Mptcpd normally only monitors non-loopback network interfaces.
-+ * Call this function to enable monitoring of loopback network
-+ * interfaces.
-+ *
-+ * @note Mptcpd monitoring of loopback network interfaces is meant
-+ *       primarily for testing purposes.
-+ *
-+ * @param[in,out] nm     Pointer to the mptcpd network monitor
-+ *                       object.
-+ * @param[in]     enable Enable or disable monitoring of loopback
-+ *                       network interfaces.
-+ *
-+ * @retval true  Successfully enable or disabled.
-+ * @retval false Invalid @a nm argument.
-+ */
-+MPTCPD_API bool mptcpd_nm_monitor_loopback(struct mptcpd_nm *nm,
-+                                           bool enable);
-+
- #ifdef __cplusplus
- }
- #endif
-diff --git a/lib/network_monitor.c b/lib/network_monitor.c
-index 2ae275b..7a3927e 100644
---- a/lib/network_monitor.c
-+++ b/lib/network_monitor.c
-@@ -4,7 +4,7 @@
-  *
-  * @brief mptcpd network device monitoring.
-  *
-- * Copyright (c) 2017-2021, Intel Corporation
-+ * Copyright (c) 2017-2022, Intel Corporation
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -78,6 +78,9 @@ struct mptcpd_nm
- 
-         /// Flags controlling address notification.
-         uint32_t notify_flags;
-+
-+        /// Enable/disable loopback network interface monitoring.
-+        bool monitor_loopback;
- };
- 
- // -------------------------------------------------------------------
-@@ -525,16 +528,15 @@ static void mptcpd_interface_callback(void *data, void *user_data)
-  *
-  * @return @c true if network interface is ready, and @c false other.
-  */
--static bool is_interface_ready(struct ifinfomsg const *ifi)
-+static bool is_interface_ready(struct mptcpd_nm const *nm,
-+                               struct ifinfomsg const *ifi)
- {
--        /*
--          Only accept non-loopback network interfaces that are
--          up and running.
--        */
--        static unsigned int const iff_ready = IFF_UP | IFF_RUNNING;
-+        // Only accept network interfaces that are up and running.
-+        static unsigned int iff_ready = IFF_UP | IFF_RUNNING;
- 
-         return (ifi->ifi_flags & iff_ready) == iff_ready
--                && (ifi->ifi_flags & IFF_LOOPBACK) == 0;
-+                && ((ifi->ifi_flags & IFF_LOOPBACK) == 0
-+                    || nm->monitor_loopback);
- }
- 
- /**
-@@ -708,7 +710,7 @@ static void handle_link(uint16_t type,
- 
-         switch (type) {
-         case RTM_NEWLINK:
--                if (is_interface_ready(ifi))
-+                if (is_interface_ready(nm, ifi))
-                         update_link(ifi, len, nm);
-                 else
-                         remove_link(ifi, nm);  // Interface disabled.
-@@ -1301,7 +1303,7 @@ static void handle_rtm_getlink(int error,
-         struct ifinfomsg const *const ifi = data;
-         struct mptcpd_nm *const nm        = user_data;
- 
--        if (is_interface_ready(ifi)) {
-+        if (is_interface_ready(nm, ifi)) {
-                 (void) insert_link(ifi, len, nm);
-         }
- }
-@@ -1442,9 +1444,10 @@ struct mptcpd_nm *mptcpd_nm_create(uint32_t flags)
-                 return NULL;
-         }
- 
--        nm->notify_flags = flags;
--        nm->interfaces   = l_queue_new();
--        nm->ops          = l_queue_new();
-+        nm->notify_flags     = flags;
-+        nm->interfaces       = l_queue_new();
-+        nm->ops              = l_queue_new();
-+        nm->monitor_loopback = false;
- 
-         /**
-          * Get network interface information.
-@@ -1555,6 +1558,15 @@ bool mptcpd_nm_register_ops(struct mptcpd_nm *nm,
-         return registered;
- }
- 
-+bool mptcpd_nm_monitor_loopback(struct mptcpd_nm *nm, bool enable)
-+{
-+        if (nm == NULL)
-+                return false;
-+
-+        nm->monitor_loopback = enable;
-+
-+        return true;
-+}
- 
- /*
-   Local Variables:
-diff --git a/tests/test-network-monitor.c b/tests/test-network-monitor.c
-index d7c6b87..d22f6be 100644
---- a/tests/test-network-monitor.c
-+++ b/tests/test-network-monitor.c
-@@ -4,7 +4,7 @@
-  *
-  * @brief mptcpd network monitor test.
-  *
-- * Copyright (c) 2018-2020, Intel Corporation
-+ * Copyright (c) 2018-2020, 2022, Intel Corporation
-  */
- 
- #define _DEFAULT_SOURCE  // Enable IFF_... interface flags in <net/if.h>.
-@@ -115,12 +115,11 @@ static void check_interface(struct mptcpd_interface const *i, void *data)
-         l_queue_foreach(i->addrs, dump_addr, NULL);
- 
-         /*
--          Only non-loopback interfaces that are up and running should
--          be monitored.
-+          Only network interfaces that are up and running should be
-+          monitored.
-         */
-         static unsigned int const ready = IFF_UP | IFF_RUNNING;
-         assert(ready == (i->flags & ready));
--        assert(!(i->flags & IFF_LOOPBACK));
- 
-         if (data) {
-                 struct foreach_data *const fdata = data;
-@@ -249,6 +248,14 @@ int main(void)
-         struct mptcpd_nm *const nm = mptcpd_nm_create(0);
-         assert(nm);
- 
-+        assert(!mptcpd_nm_monitor_loopback(NULL, true)); // Bad arg
-+
-+        /*
-+          Enable loopback network interface monitoring for this unit
-+          test in case non-loopback network interfaces are unavailable.
-+        */
-+        assert(mptcpd_nm_monitor_loopback(nm, true));
-+
-         struct mptcpd_nm_ops const nm_events[] = {
-                 {
-                         .new_interface    = handle_new_interface,
diff --git a/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch
new file mode 100644
index 000000000000..7e3357c8e361
--- /dev/null
+++ b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/832563
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ dnl Support "--enable-debug=..." configure script command line option.
+ AX_IS_RELEASE([git-directory])
+ AX_CHECK_ENABLE_DEBUG([yes])
+ 
+-AM_INIT_AUTOMAKE([1.15 -Wall -Werror -Wno-portability silent-rules std-options check-news])
++AM_INIT_AUTOMAKE([1.15 -Wall -Wno-portability silent-rules std-options check-news])
+ AM_SILENT_RULES([yes])
+ LT_INIT([disable-static])
+ 
+@@ -301,7 +301,7 @@ LIBS=$mptcpd_save_libs
+ # warning free.
+ # ---------------------------------------------------------------
+ AX_CFLAGS_WARN_ALL([CFLAGS])
+-AX_APPEND_COMPILE_FLAGS([-Wextra -Werror -pedantic])
++AX_APPEND_COMPILE_FLAGS([-Wextra -pedantic])
+ 
+ # ---------------------------------------------------------------
+ # Enable compile-time defense
diff --git a/net-misc/mptcpd/mptcpd-0.9.ebuild b/net-misc/mptcpd/mptcpd-0.10-r1.ebuild
index a35610eb41ad..2ee9b4505be0 100644
--- a/net-misc/mptcpd/mptcpd-0.9.ebuild
+++ b/net-misc/mptcpd/mptcpd-0.10-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/${PV}"
 IUSE="debug doc"
 
 RDEPEND="
-	>=dev-libs/ell-0.30.0
+	>=dev-libs/ell-0.45.0
 	elibc_musl? ( sys-libs/argp-standalone )
 	"
 DEPEND="
@@ -27,9 +27,6 @@ BDEPEND="
 	)
 	virtual/pkgconfig
 	"
-PATCHES=(
-	"${FILESDIR}/${P}-loopback-monitoring.patch"
-)
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -41,9 +38,15 @@ fi
 
 CONFIG_CHECK="MPTCP"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9-no-werror.patch
+)
+
 src_prepare() {
 	default
-	[[ ${PV} == 9999* ]] && eautoreconf
+
+	# For Werror patch
+	eautoreconf
 }
 
 src_configure() {
@@ -64,3 +67,8 @@ src_compile() {
 src_test() {
 	emake check
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild
index 8f307676ab46..2ee9b4505be0 100644
--- a/net-misc/mptcpd/mptcpd-9999.ebuild
+++ b/net-misc/mptcpd/mptcpd-9999.ebuild
@@ -13,7 +13,7 @@ SLOT="0/${PV}"
 IUSE="debug doc"
 
 RDEPEND="
-	>=dev-libs/ell-0.30.0
+	>=dev-libs/ell-0.45.0
 	elibc_musl? ( sys-libs/argp-standalone )
 	"
 DEPEND="
@@ -38,9 +38,15 @@ fi
 
 CONFIG_CHECK="MPTCP"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9-no-werror.patch
+)
+
 src_prepare() {
 	default
-	[[ ${PV} == 9999* ]] && eautoreconf
+
+	# For Werror patch
+	eautoreconf
 }
 
 src_configure() {
@@ -61,3 +67,8 @@ src_compile() {
 src_test() {
 	emake check
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index 38cbe8193975..f051ba1cebfe 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
 DIST ndisc6-1.0.5.tar.bz2 263243 BLAKE2B 638e47e2bb1671a0bdd53edafd65acc774f068442dd6ade398e8bcae5630353f64b753b04237443aa6a6ea27de36206359e93e308fe5e610a4133ed730d71dd1 SHA512 d2742fee8202da988fd6d2b4b811125a4ab786b645b96b3a1fcfe248a3d9a39706055cf499c6cc742decfa5c3dbcbaac28ae01a50b9ad3ec10906dd468fec47e
-EBUILD ndisc6-1.0.5.ebuild 735 BLAKE2B 8e3e5cb0be4d48d55321010007466b239c30b213a274efd709c930b65578f3b467d6eed4874153f5e1b7797073aac157c32588e3b2ec3ed8f76dbf3df9ef6e9a SHA512 1448484d7aab71f9cbae22e5e58d215e8eb8453cc399c713e290f2de4b6a614045e4a57d249aa44f85569a42e3f496e9d5b9d90cada9183efd51150d0dedf1ee
+EBUILD ndisc6-1.0.5.ebuild 749 BLAKE2B 7d7f3647238e0a2a42f584bb5ae1b20f6230b4f8fa3c823b008a0701f12ed527820c741479788fd7c96f6fe193bc81979887428792ae70e77a009617de0b05ce SHA512 64b2890d31f5bbc6bdd7db9ed59a8381df40f74ca29e98009282206442c6dd4b720dc2fb3ea3735dad54c5ff828b3d57ae3b024ab7e2c9e66b70a36b446b999a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/ndisc6/ndisc6-1.0.5.ebuild b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
index 19faf911e8ef..3e0dcf8b5974 100644
--- a/net-misc/ndisc6/ndisc6-1.0.5.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos"
 IUSE="debug"
 
 BDEPEND="dev-lang/perl
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 57a71449b0a2..f64e9d75e885 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -7,6 +7,7 @@ DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9
 EBUILD netifrc-0.7.1-r1.ebuild 2163 BLAKE2B 4aa9bcf12490e3078d1e3f35a2a1986466ed8813e7ed6a103789f1b40c4fb21c0900266d0c94ee04e7f5a7476c5fae098f8a4f797714cf396a459ad7037aed50 SHA512 4f0e51fd9d543175d9851f42a24fa2d26beb73122ebef6c3b594827d682aaced4ae72b872d00fd9802e2f052600ef22caee4ad455dbd4e500ff66770a8780396
 EBUILD netifrc-0.7.1-r2.ebuild 2150 BLAKE2B f59f860df7863caae5bb6dccb875ee69f07eadfe8daecc8cd2e6a950f065f066f07851e430206dda368534bf895b9adc140dd1903aefe70df8ff5f467a734e03 SHA512 b84e81bb7e9ccdb1bf0dbe9e120bffc021075ff93adf886d2a9ac6c47ce5cf2c4103dabe3735ea008becb7079fbd056ff418f514739c796f182a4b75f82ac8be
 EBUILD netifrc-0.7.2.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618
-EBUILD netifrc-0.7.3.ebuild 2046 BLAKE2B 4fcaa88f1e704dcf458f091ddf2c27c2cccb18df34445f4184e70a827b75f66e0d6424e933af645ab62771842a3cc06d2522e9f7a8b99ec0112c7aa345ab5f3f SHA512 f67ce294110d44caf484925ebf8a8db87e804556008696248c3f2efa0cb7ebd5f68eb5e4471a659ace35d7d6f78001ce7b10a26366c580db9cf4d53de29b21a1
-EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
-MISC metadata.xml 378 BLAKE2B e584edab27591b4a40ac076f15cd088bd26a3b025cc745b1a59dde9f706b442915f8bd002667643891be203cfc4d6c660fee6fe6674f8e0240022055e84fdfca SHA512 80963f5069e87f4c6929ccfc7cd819fd169f12fc576a2184e6bc8908459086552f252da89996e153a9ca7d524feaed9f9833c03ad571a1b987c46adbc18bdd78
+EBUILD netifrc-0.7.3-r1.ebuild 2128 BLAKE2B 1a14c0c30ae196891e1d3ed665fc6dee33890ef24721313ee7c73bf9c12a9fa7e1c8987e61079251523491a56449cfcb117a4dbbf9a73713f4a376e2494edb09 SHA512 bbe7078c8bcfb35cf90f5eb95829f8947fa466ae7a718c0d211164f30d6041c41f518f0aae3f0fd2268e1939fdf42100421573079348536de3dc7ec972700f17
+EBUILD netifrc-0.7.3.ebuild 2059 BLAKE2B 04bce3c3cdf9b43384e6918de8e91b59ee43fa74a23715c409bff93a7861b968225e604d40a412cb20440d0f3afaa53ea750eeded1a4b674074ee2e306da9ed5 SHA512 c907ae80e8b9a4552b2f5129efe0133ea48341584cae701acc3b37f3a172936413a0a6f9bb93e04b98139590230373121a0bd24cdfd5e4a3dddc7e64bd87fe5f
+EBUILD netifrc-9999.ebuild 2060 BLAKE2B 1d366d74654ce50998e446ad389b0c363b5295422f5d1a1d18634b904d1ebefb7e0ab4b793c6589d3dcfdcaf900d103f12afd373b9fcb1a805f8498eb55a3282 SHA512 3af84d8a1c1e7a031f376f16f4fd874dbe5c43431cb1164d86f81b4b444ca989fbb66209ccf105a59ee0b3a65697d6f386cb115bbc1699c205fa4a01f11f96ef
+MISC metadata.xml 459 BLAKE2B 2f21ebec95bd3cbb5e031d3b75255cd1238c8102aec86f24a308802da200243303cb9dc055e539c6fc9b4b466813931fbd8ef90812391bda0612a69b1d09f491 SHA512 4b96b583ea7c9e3fe9b1e0a6023d5e32c640ebd6d532e98ad337952c9d083be5049c03ee8e3190cd9ebe9f2a7401a5cb23027ba903b328ea032ad0197bf47c47
diff --git a/net-misc/netifrc/metadata.xml b/net-misc/netifrc/metadata.xml
index 19c1e2b9b47a..4f718879b413 100644
--- a/net-misc/netifrc/metadata.xml
+++ b/net-misc/netifrc/metadata.xml
@@ -8,4 +8,7 @@
 		This package contains the Gentoo network interface management
 		scripts, which were separated from OpenRC.
 	</longdescription>
+	<use>
+		<flag name="dhcp">Allow interfaces to configure via DHCP</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/netifrc/netifrc-0.7.3-r1.ebuild b/net-misc/netifrc/netifrc-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..daf90d2df7ed
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.7.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+dhcp"
+
+DEPEND="!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27
+	dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	default
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+	# Install the service file
+	LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	UNIT_DIR="$(systemd_get_systemunitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	udev_reload
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.7.3.ebuild b/net-misc/netifrc/netifrc-0.7.3.ebuild
index ac56715aca1e..d06417b6031a 100644
--- a/net-misc/netifrc/netifrc-0.7.3.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.3.ebuild
@@ -61,6 +61,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
 	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
 		elog "The network configuration scripts will use dhcp by"
 		elog "default to set up your interfaces."
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index 4503bec9c25e..31f53c53facc 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -61,6 +61,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
 	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
 		elog "The network configuration scripts will use dhcp by"
 		elog "default to set up your interfaces."
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index 01a874320cfb..ec9b5087a552 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,3 +1,5 @@
 DIST netopeer2-2.1.16.tar.gz 371327 BLAKE2B fb9022cdad297ce366c00efbb0394feaa4dcff766f35c614354ea83a31871f24e05893e418face4e14df4d677c84e254cd8058259cddbc86ab4c94903eabd0f5 SHA512 9d0f1ddd38db2e9ac9a15ca1d8929eb32f682dd47c491a475acc406849fac0bc5f61f15cfabdacdedafe572855cf31cff4294c34eda2cad61e7518b62f40f71d
+DIST netopeer2-2.1.23.tar.gz 375193 BLAKE2B 14407c1d4b6a382fd0f9cf1c5d2d5f5d0aea27bac7f9b5597fe500a227b9e990e82a87da0216b310abe66f88ab5116d2f4cf101f186b9264e77a67af656a1d64 SHA512 5dcd9850151b71fe25a286bd37b672191125abe6a9e52a815f9ee88fa8200da17016f5aacbe5bcd33767cddbd18833df71d4b06b1fed1b97536e494fa70ca22f
 EBUILD netopeer2-2.1.16.ebuild 977 BLAKE2B eb43aec29553758503be90b21b00ea2492f88ae588947fe2e8c79495687b10f5d2a511ad001022fa0b1eb43655f7b56f7d311a8c060dce182d7ab130477c7059 SHA512 5823d2d5c2e3a2d93e62bd5481e9193d7eb417cb673306328a1736a4aade595a511dde32f2d20c9e3f4189b538cdc617a94151ec4f2a18dd1c09ce7fc0fc7c83
+EBUILD netopeer2-2.1.23.ebuild 978 BLAKE2B 8705bc45bfac2149cbf885480493a157435416e5b16a636ed4158058c9dbfb52af6654d6d247bec2d956c2c9d6b8f8ee143b6227ecaf6f74d0f8f05d01fbbc1a SHA512 f8a1f8c1e50979ddf8fd9e6a092857dde693f8c34e6c4234153db0c7cbc522d8229983d618559b6138490e7427878c797771fc674cdff48bffc437374879fac4
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.1.23.ebuild b/net-misc/netopeer2/netopeer2-2.1.23.ebuild
new file mode 100644
index 000000000000..7d8235fd6162
--- /dev/null
+++ b/net-misc/netopeer2/netopeer2-2.1.23.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Server for implementing NETCONF configuration management"
+HOMEPAGE="https://github.com/CESNET/netopeer2"
+SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-misc/curl:=
+	>=net-misc/sysrepo-2.1.64
+	>=net-libs/libnetconf2-2.1.11
+	net-libs/libssh:=
+	>=net-libs/libyang-2.0.194"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_HOSTKEY=OFF
+		-DINSTALL_MODULES=OFF
+		-DMERGE_LISTEN_CONFIG=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/netopeer2
+	doins -r scripts/.
+}
+
+pkg_postinst() {
+	elog "In order to do initial server setup please"
+	elog "run setup scripts located in /etc/netopeer2"
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6440168b27ce..fd642003d947 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,10 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61
-DIST NetworkManager-1.36.2.tar.xz 5432676 BLAKE2B 8ce2922573ae5b1d244e87d1b979a9fe7443e4fa2cb6caf52b59139ad92169dd46f53460871b44e687860aaee06dd6a4999d0ebce9cde466e61c203ae18dbaa3 SHA512 3d9085bb836000a2354415e5ff35e5e67eacd97680660613128b9befe981d67b6ac8d519581f8635bf219c2db03a92f182066efef3abb2094da2870e12caa353
 DIST NetworkManager-1.36.4.tar.xz 5433152 BLAKE2B 2bb625381bc5a816a9fdc51498721f9bc1e85fe2e83d114c8897f99f90af6924a0a07fddf0099f8e52c0df2f3353834129b99b4bb487b413cee503da7c680035 SHA512 17b2d39ed2584fb8b805e7b9950f9c4e6d657380881e9e78a1aa85dc58615e0a3896413a6902086f516dee2f373155f69042b4a229f3b9e15fb3c0f958cd8149
-EBUILD networkmanager-1.32.12-r1.ebuild 12157 BLAKE2B f41710a7b10d2869c5227e3f3059050616445073da2c93e5b503d417867950aa48f25483dcbf052cee0b42c4fa03d01b757afa1352ea27bf3b54956d2db093a2 SHA512 0d345d32d59aae9a5ac30ed4170e474479c441dd3b83ad83988c47826438b3ed50ada13bba73a92c4cc846fc9a75a17798281df711a20bf8f24424383932bc04
-EBUILD networkmanager-1.36.2.ebuild 12422 BLAKE2B 83ab78809afd86c015c8d9a70d2ebfa4d7c2a8b6ec64c3f33ea4364865d9e50c8daf69d2806b6953463a3c40b299276c85bba42e89cfb6dd0f1eccb7113256eb SHA512 a13101efec79eacf7175cf37b9dcc165d2927fe5135c33c28df26cd53e58cdc40a87061925506b6165e73212ccdafa49a580db632389cdcb68cd6d07a055f225
-EBUILD networkmanager-1.36.4.ebuild 12422 BLAKE2B 246ed312b874ced5d1dcfbd0dce2e96eb252f9627dac000f7983ccaafa526e419245ff77b79ef92b60f71fcb94a34a2c2e3d565f12aa5437eac68921ba5b107e SHA512 e9698d31d78e5a6bab1ddc83f47c62cffd7b5f2b887540cc765fe0ad274d169d1fd743266b93d5a09d3b34cce7a003084edeb40e3d1ba1228730e8ae72ccd1cc
+DIST NetworkManager-1.38.0.tar.xz 5431664 BLAKE2B adc298681e339d6cfac9c7310a94a1b11bc7f5044a0b2a129d5ab764bd5f29ccc604bbc27c49d52ceab9e2e6dbd923a686fbaf96cf20c73438d680fa5659e5ff SHA512 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
+DIST NetworkManager-1.38.2.tar.xz 5526780 BLAKE2B 54e9746d3bf41146bb2bbc1ec273c4e2ca0a458e1a488eba7e5f17572e6e8db02ccfcd5b884e00162e505512b24a38de77447944d979fbe40d20d4af4c688a71 SHA512 0da3294bec659e6742c2b941eb6cb2464df1018e801148ac37cce0a0612c4468701add13659c18b1c08b51556c7e3e2782ad2353804fdf2a094e97d531da964b
+EBUILD networkmanager-1.36.4.ebuild 12499 BLAKE2B 265082e6355c141f4519b00ec136b1aed69461e91f299c7de5f03108abfdef69f2743c1cefcee800eb4659945263324aa0aa7df2ea507d88ac0c569966d1c8d7 SHA512 a6c7ee2a653ab3d7d873156ed45c6ea51eb9fc65574a84a240457564c54681f6830984d7c3177e7de342f04ce5622e0d89f8f1a7a59c163a076592a3340bcbe2
+EBUILD networkmanager-1.38.0.ebuild 12526 BLAKE2B 3617f3cb3de8b4c00fb1c1be6505a0289f798d0ad93068a50b68e4b31ad0cbfa81b474f4a64e1de7a7c2b7980fe70f7f6aeb404f7c0b1cbfaf63269657bcd432 SHA512 2d27c3bad9613e467bef49ffab35b26b3a779419439fa1dae2a17b52d7988ee46cdecb1cb067a04534ba1e47d3a4dafdf7db8f7441642aae4e9ed076f8ff3a69
+EBUILD networkmanager-1.38.2.ebuild 12543 BLAKE2B 1235910f66ea116902f8041e95f6e8d38a8ceb9f651eef76eca82f7439c42a2d863352fdca33aa02f7ad710920a683ccad4b724332ea99fdc817db83c830cc59 SHA512 3a0dd2337e4af2af2fc5a6631c769e8b34223b29274c3f97cd3fc933be486a02f75dcf32711bf4aa6175e8b17bf022543ae8094262e9a00f96e8bc60955412dc
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.36.4.ebuild b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
index 400242fc95b3..6fbf9dea8762 100644
--- a/net-misc/networkmanager/networkmanager-1.36.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:0= )
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
 	audit? ( sys-process/audit )
 	teamd? (
 		>=dev-libs/jansson-2.7:=
@@ -90,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.18
 	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
diff --git a/net-misc/networkmanager/networkmanager-1.36.2.ebuild b/net-misc/networkmanager/networkmanager-1.38.0.ebuild
index 40c06d6ef040..47515b23c184 100644
--- a/net-misc/networkmanager/networkmanager-1.36.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.0.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:0= )
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
 	audit? ( sys-process/audit )
 	teamd? (
 		>=dev-libs/jansson-2.7:=
@@ -62,7 +65,7 @@ COMMON_DEPEND="
 	dhclient? ( >=net-misc/dhcp-4[client] )
 	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
 	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( net-dns/openresolv )
+	resolvconf? ( virtual/resolvconf )
 	connection-sharing? (
 		net-dns/dnsmasq[dbus,dhcp]
 		iptables? ( net-firewall/iptables )
@@ -90,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.18
 	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
@@ -369,6 +373,8 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	systemd_reenable NetworkManager.service
 	! use systemd && readme.gentoo_print_elog
 
diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
index fd6fc99404a6..15e85166b3f8 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
 
@@ -14,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -30,7 +29,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +40,10 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:0= )
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
 	audit? ( sys-process/audit )
 	teamd? (
 		>=dev-libs/jansson-2.7:=
@@ -62,7 +64,7 @@ COMMON_DEPEND="
 	dhclient? ( >=net-misc/dhcp-4[client] )
 	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
 	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( net-dns/openresolv )
+	resolvconf? ( virtual/resolvconf )
 	connection-sharing? (
 		net-dns/dnsmasq[dbus,dhcp]
 		iptables? ( net-firewall/iptables )
@@ -71,8 +73,9 @@ COMMON_DEPEND="
 	psl? ( net-libs/libpsl )
 	concheck? ( net-misc/curl )
 	tools? (
-		sys-libs/readline:0=
 		>=dev-libs/newt-0.52.15
+		libedit? ( dev-libs/libedit )
+		!libedit? ( sys-libs/readline:= )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -89,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.18
 	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
@@ -116,11 +120,11 @@ BDEPEND="
 
 python_check_deps() {
 	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
 	fi
 	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
 	fi
 }
 
@@ -175,7 +179,7 @@ src_prepare() {
 		root password, add your user account to the 'plugdev' group."
 
 	default
-	use vala && vala_src_prepare
+	use vala && vala_setup
 
 	sed -i \
 		-e 's#/usr/bin/sed#/bin/sed#' \
@@ -231,6 +235,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool bluetooth bluez5_dun)
 		-Debpf=true
 
+		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
 		-Dconfig_plugins_default=keyfile
 		-Difcfg_rh=false
 		-Difupdown=false
@@ -295,6 +300,12 @@ multilib_src_configure() {
 		emesonargs+=( -Dcrypto=gnutls )
 	fi
 
+	if use tools ; then
+		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
+	else
+		emesonargs+=( -Dreadline=none )
+	fi
+
 	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
 	if use ppp; then
 		local PPPD_VER=`best_version net-dialup/ppp`
@@ -361,6 +372,8 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	systemd_reenable NetworkManager.service
 	! use systemd && readme.gentoo_print_elog
 
@@ -398,3 +411,7 @@ pkg_postinst() {
 		ewarn "the main.dhcp configuration option to use one of them instead of internal."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 750a68a91d27..3f448710e8d9 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,10 +1,9 @@
-AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
-DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
-DIST nextcloud-client-3.4.2.tar.gz 14329069 BLAKE2B 5a23e9a7535aff3591d73d2b17abf71cb6302b9acfa41a1de051d42d9acb4cf4d76ed1dff3c73ec989a066c51d4fe9e94d6e71718f9fc0533d0c0e2bb0949060 SHA512 9788fd658c9e7c3b26eb3c41934ee75222aba0afd38e1fd71f8f04472bf4971e5cc7c12469f0b3f909f4dc1e5aa1a063ae1324f6a8b6052cdf9b3c8c1cc8c909
 DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71
 DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
-EBUILD nextcloud-client-3.3.6.ebuild 2193 BLAKE2B 50f2084e5a1882d928273fcc938ff6258fc88b0fc2c22c47bfe2ff361e6791abb5f9e7baa6c8b8aee0ed696dd90f994f7fc9ddb985ed2ea6088208ce8576a951 SHA512 55038556483e044b6f91906efc6feb9311bde74bb09dab1877af6c92e0d5c70d3e8405541d9a30ee2aa7aa1c121d5d691cbbb4b4711a0bfc2c8289dfd4c69a3d
-EBUILD nextcloud-client-3.4.2.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+DIST nextcloud-client-3.5.0.tar.gz 15359946 BLAKE2B 144f50fb1ce3f1cad205fd2bf5c161c54602d75642518e4db2bad1e384b28bf3baf3ba7a22eafe7530aae9aa1bced4c2025c33dc1566ba48db64224ae00537e9 SHA512 9c20cc2878832fb9fbe690fb0a2b9f960ea58480bb14c89d8e713d9847a27fad920ce4b507fb8b7b5ac211f4a0e1c775e3b985d57acd9191e87f45e01a86f85c
+DIST nextcloud-client-3.5.1.tar.gz 15392337 BLAKE2B 6f3826e33828aacfbefb1786c9a1231ccba0be4b649cc132546914d7c61b8755b32f873a9eb5c27d10d207121636738bc51354643d056ffe6733c5cd0f395cac SHA512 989cc4c99f81f7451af8b13453155f0c89448226ade565025030a8064c7e54e5668b37744564685cc700f2b5a54f899d563a4be2bfe023e43987928982a2feba
 EBUILD nextcloud-client-3.4.3.ebuild 2182 BLAKE2B 33133006cd7cba83da279d15122a00b82658967bbc3df8c2da157f9ed87582526e84b6959dd3d39dfdb909fee75eacb780a0548a9bd40564ceb38d7e61e805e9 SHA512 3b1957a1755b3dadb4d2a92d9991d97f1a17bf4f94120ea44219a46bf49b909fb8828a9f4f56e929c375d631e46645ab2cf4c084c98a26b58ebba98cf080960e
-EBUILD nextcloud-client-3.4.4.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+EBUILD nextcloud-client-3.4.4.ebuild 2181 BLAKE2B d246952097b7b568f21956df4b78f9189e70367edbf7798b5b915afab8468b8eb1de1a33daa7591457ad94a68c7adc7668317402e8fe3f038df498329999b0c3 SHA512 b783495c8c6ed6abe9337b9573eb7d3e8c63b4e4082643598d4273aec15b5724faee52170517e25f330541d099d4f4f993f52bdd062f4166ae19211d22bf9367
+EBUILD nextcloud-client-3.5.0.ebuild 2331 BLAKE2B 809323f95c13f2cb654c56696ff85eb4d663b533656f6f6e775dcce04e0efe8efaad503799ca6a55a8aace92506b0d2ef84432124829f64d480728644f4b14d4 SHA512 5c96c010bdb9b45ae5fdf9f0de66e86ffd6b213b05222f6eca5729430ba26169dab240eb6356318ca949957e6d30074e78a0a27cc4b81b5910a2cfa79bdf2067
+EBUILD nextcloud-client-3.5.1.ebuild 2331 BLAKE2B 809323f95c13f2cb654c56696ff85eb4d663b533656f6f6e775dcce04e0efe8efaad503799ca6a55a8aace92506b0d2ef84432124829f64d480728644f4b14d4 SHA512 5c96c010bdb9b45ae5fdf9f0de66e86ffd6b213b05222f6eca5729430ba26169dab240eb6356318ca949957e6d30074e78a0a27cc4b81b5910a2cfa79bdf2067
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
deleted file mode 100644
index 8e5510db04d5..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001
-From: Heinz Wiesinger <pprkut@liwjatan.org>
-Date: Thu, 26 Aug 2021 16:07:25 +0200
-Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape
-
-Signed-off-by: Heinz Wiesinger <pprkut@liwjatan.org>
----
- src/gui/CMakeLists.txt | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 970d2fc165..efe1b1c349 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
- endif()
- 
- # Generate png icons from svg
--find_program(INKSCAPE
--  NAMES inkscape inkscape.exe
-+find_program(SVG_CONVERTER
-+  NAMES inkscape inkscape.exe rsvg-convert
-   REQUIRED
--  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
-+  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
- # REQUIRED keyword is only supported on CMake 3.18 and above
--if (NOT INKSCAPE)
--  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
-+if (NOT SVG_CONVERTER)
-+  message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.")
- endif()
- 
- function(generate_sized_png_from_svg icon_path size)
-@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size)
-   set(icon_output_name "${size}-${icon_name_wle}.png")
-   message(STATUS "Generate ${icon_output_name}")
-   execute_process(COMMAND
--    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-+    "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-     WORKING_DIRECTORY "${icon_name_dir}"
-     RESULT_VARIABLE
--    INKSCAPE_SIDEBAR_ERROR
-+    SVG_CONVERTER_SIDEBAR_ERROR
-     OUTPUT_QUIET
-     ERROR_QUIET)
- 
--  if (INKSCAPE_SIDEBAR_ERROR)
-+  if (SVG_CONVERTER_SIDEBAR_ERROR)
-     message(FATAL_ERROR
--      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
-+      "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}")
-   else()
-   endif()
- endfunction()
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
index df314cf64b74..f73bb52faae8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
index df314cf64b74..df8b692a88c8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+COMMON_DEPEND="
+	>=dev-db/sqlite-3.34:3
 	>=dev-libs/openssl-1.1.0:0=
 	dev-libs/qtkeychain:=[qt5(+)]
 	dev-qt/qtcore:5
@@ -33,9 +34,10 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
 		kde-frameworks/kio:5
 	)
 	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
@@ -50,8 +52,8 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-util/cmocka
 		dev-qt/qttest:5
-	)"
-
+	)
+"
 RDEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}/desktop-${PV/_/-}"
@@ -86,6 +88,14 @@ src_test() {
 	virtx cmake_src_test
 }
 
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
index 311dd37b9f30..df8b692a88c8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg
+inherit cmake virtualx xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -11,13 +11,14 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+COMMON_DEPEND="
+	>=dev-db/sqlite-3.34:3
 	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
+	dev-libs/qtkeychain:=[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
@@ -33,9 +34,10 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
 		kde-frameworks/kio:5
 	)
 	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
@@ -50,12 +52,10 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-util/cmocka
 		dev-qt/qttest:5
-	)"
-
+	)
+"
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch )
-
 S="${WORKDIR}/desktop-${PV/_/-}"
 
 src_prepare() {
@@ -78,12 +78,24 @@ src_configure() {
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
 		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DUNIT_TESTING=$(usex test)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index a7f1b2a4ffc6..81b3ee910511 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -11,6 +11,7 @@ AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff01840
 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c
 AUX ntpd.confd 192 BLAKE2B f5387ba2571b238a3e4f78c11151153deb40ad0babe4728942ec0f5f87d405e95047a3a72c7f747fb52e6bfc0dc2e8da10867e83394ff07e8381fbdf0b666c26 SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91
 AUX ntpd.rc-r1 489 BLAKE2B 6d3fe11a2ba7d04d02b24ca3acbcae5419908d12e94118bf91fca825f7561304a01dc9085cdc371b91498f6b14503c94cddeeb462b23c2b4b1017d3bfd3bd3ba SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734
+AUX ntpd.rc-r2 498 BLAKE2B 8a6d69a3248aae2321a4181ecddd73ee914c1232d6aa7123958a95548773a06d79e4af870fbf458926f0ab71ce6eb17666f160d05830fe27c01b66fb68e9cd5f SHA512 2a2c297345728207eafd3afb106b1da44d4b98566b44803eda000aff775e80d979172a6e3ae01b6c3d99433ba8b45e8b7b30e68e3e00e59e15b16fe63fbeda9a
 AUX ntpd.service-r2 207 BLAKE2B 5df5cbdde640e2686b94bf5ae952f257ec6905204aade6e0c482623187456336a5f7e4dc89fe56d929f17b16a8016e775c83f8db0bf8cfc30a819cf79da16b2d SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1
 AUX ntpdate.service-r2 325 BLAKE2B 807cef41cdaf78e582f6e77b8c992c8fed048ccb64b01152111294e4f281858815d17d90318421ba6dfcfceb49dbbbd8ae691533ff5e06ed972fb298f17d0e02 SHA512 745a9b9dd3a440b41228b1139978782dc1c2dd9a0876b5c4f9b842570fab1a6c6fd8f9e1a8b638aa7113ec863cefc17d578d8497ef4ea685ad984fc4020fb2db
 AUX ntpdate.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
@@ -20,5 +21,6 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
+EBUILD ntp-4.2.8_p15-r1.ebuild 4450 BLAKE2B 03cc11b1dee2e54147d4c32b5be2d101855e0a9405414379dd4dd1fa50b0c8f8c2fe05956e7711c185018651a994a3ba57d6199184335236305fcdb786244191 SHA512 5bf81b7c97c147f8d96baaa894c98ac5c555db34316988807052ee41ad84c7a92f7d0d03325a7cf9ddd39a674db4a523c2f6aa361bf7b1ccc6915ad8e8d2af70
 EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9
 MISC metadata.xml 1015 BLAKE2B e03bcac085561ec53ec02230b618fa01e26dd6167635f0af06434213305d5f4b966f94f0280db24a509990eaade216e7c7a853d9990969de26a8444088c5a444 SHA512 b00dc21b9b06f909812028bbad340d6b1c68b105fec664476cd4222947c687fc16f1925d77fb14e23b31c84a26849dc397acc7657726abfc35a43dfafc10589b
diff --git a/net-misc/ntp/files/ntpd.rc-r2 b/net-misc/ntp/files/ntpd.rc-r2
new file mode 100644
index 000000000000..f4608f784615
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.rc-r2
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS}"
+command_args_background="-p ${pidfile}"
+command_args_foreground="-n"
+
+depend() {
+	use net dns logger
+	after ntp-client
+}
+
+start_pre() {
+	if [ ! -f /etc/ntp.conf ] ; then
+		eerror "Please create /etc/ntp.conf"
+		return 1
+	fi
+	return 0
+}
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild
new file mode 100644
index 000000000000..7e0c42fe3689
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+BDEPEND="virtual/pkgconfig
+	acct-group/ntp
+	acct-user/ntp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
+	"${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch
+)
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		# Increase the default memlimit from 32MiB to 128MiB.  #533232
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index e76768f8ff65..ee05d62d41f3 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -2,14 +2,19 @@ AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba403
 AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9acb02f9016bfeabd94a043e92d1b1be11e74b838e9cc91d7d7c1144539917c927537e67f92b45003e SHA512 cdfbc735e157306597ff3c37b5aea34d64c66a69bbb9dbfba6c7eb57d6b201c9d2e86969e5be9b8331e75e1de8eaa17ee4d8f72bed9bc058a6198bf5a2d717c6
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
+AUX ntpd.rc-r3 494 BLAKE2B 5ad7e659403b21d35c24011eca17c108bbbf4874f86ad4f9421f5dd633abcfc747444bdcbe840dca14b7b55f3867ddd376626ec40c71bbb67ded98ef75d544f7 SHA512 792480abee2b641d383fdb63a5478172e63c90f7390d1a1e0ffcb7a1477a15c27c3588c4a810eeca62c3990aebc28da6c0903d451236bc727f806d3635766864
 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
 AUX ntpsec-1.2.1-build-notests.patch 1512 BLAKE2B 16f1b49802c2883866d5ddc862c49ddca994fc530938b53d6059a0f044aa67692180efd528727b91940357562eb4db4a1abaa0a04404b13b912eb11a6a94b9fc SHA512 5b9cf22809a727c687d4a6796a334fd515d1de3883f2e72b5a44e787dd5e1189cc86e5a50c7f693d45e58ac1c5ee0503571fe4aa15cc31f7fc7d3f409128d21e
+AUX ntpsec-1.2.1-seccomp-nsd.patch 1469 BLAKE2B a3b0db89c8eff4f184263fdaaaf522718cd8bbc26b67b5bfdbbff3ba4e4c6000702f8e683d4069a2a87b157748025d48ecbd68f6f1634ca2070083a9b9326e2e SHA512 f73989906b24357a99dc5d56ab830c7f5605c992b11d25d75ef35b92242cdcb41cad2bf301963c1df2f3564ffe96ac19bd1836060585187ee282719b6cb2b66a
 AUX ntpsec-1.2.1-seccomp-rollup.patch 2987 BLAKE2B 82bd355cdd169133f232f6514f363e87b6876472d49d69d034dd33aefe7179dc3db5e661909774471635dd947761f5e8ab47ecc0dcf8d6c2e62ffdad06044a3f SHA512 34c1941dfd7d7968fa954fb36411aad5e711767f1c0b6aca52cd8f8c839163110af2d4774a7a41b1f3d0daa49af5823b74e9c8a2a9ec12b9a344c72ce505d279
 AUX ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch 785 BLAKE2B df61801e9748e20ce7fa8577c472ea2ed4e31a8d2cb1aef39a245bfe145e482b61b6b30398fc5c2da69685ed872b70ac8399481ec71ea35fc4469df1b83bd195 SHA512 a35ba539aa6a0b8f28079e1dd7a729e7ea21ab045233d7b5e1938a11c03a72aa87907068505e0330c644ebb9b509663a21a24ad9a4cc954a0f03ec7198309c0e
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11cefe338b8a309d37818524896cb694d9a479ab80613763bd2c779680ccecc06526dfca87370409372788ba9254b9003 SHA512 3ac296a2329b2a9dede51499a75f82eeae1870ad5dbd769b7ea1f3d4634ff2512fda8383f7d3adc6fa1a4fd03e035cf0b52157639ca21f458af161fffbf6a0e4
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
 EBUILD ntpsec-1.2.1-r2.ebuild 4434 BLAKE2B fc33f87243be18fe8ccf1faccc5aa261a162656e8c675fedaa333631ae85c95ca59bf8a06b24c4a3b3e46ab669bc026ae164afdb2a507f3e19b2cef3c7139602 SHA512 d564a533817ad9a54c81db43b8ab1e09dea2f8aa749c930662e2912bb0e058d9fdc835ab22599d403fe34dc85c6a1a25fe0635667ea8a6cf12cd9d5718baa507
-EBUILD ntpsec-1.2.1-r3.ebuild 4686 BLAKE2B 648e6194976a9a9e237f49c5fc05e7fab7bb777ffc318887d137f0222ddeaf14aee9785d03d574bf45cd2503c0e80605eb9badc4ff158c360a83444db41ebaa6 SHA512 270c6e2496e250f9871a16f74438aa709105c2da06f0df0459cdafc8692543ddcb2e2e7b44af85c66d7c33badeeae6647f9592165fd8dd9ee2f066014d22d49b
-EBUILD ntpsec-9999.ebuild 4534 BLAKE2B baffc367ed04fe5042e4acad1c7172e280f49e9f391f409f14bc4511ae02d3a1927c3c4f2198e7bedd64243c81ff8e75b797faf8b04f8c1b92cda922468f9843 SHA512 979c140c15e1c7f6b99c21fad33d825961e22306031d6ada7775d0af35f35391af33007049359a8b66b983cf0dc178683c8f5db62cd42600fb10f15826f31f12
+EBUILD ntpsec-1.2.1-r3.ebuild 4683 BLAKE2B 9106135c2355acd4bfefb24c0b68fb6ab1300773fd7cf8aa9dda380b210b61c8f1cc42555c7571b292b2131bc39bf1c0e9b3f6b7a09a0e152fa025bad9aff1c7 SHA512 253294ff11133d62bc54fe5f5bdd3c6b25cecbf02fe84676f99e190d752343cbf5783111d85fc183097d9fcb956385ae0342beb5f0428ea851218a3e8652f360
+EBUILD ntpsec-1.2.1-r4.ebuild 4686 BLAKE2B 94e74b206caf561809b32b1e369f2fe77d133caddfdbd499b36858a5510a62afc43a9dd0ffde54ee98d18da88a70af049d7679fd0e3bd0e40fca682085e1a6ae SHA512 f3e165bf6fc6c4074d3182c22fdae1ce51fd36dfe3e91947f1bbaabcae032bd80b402fd4341a0e38b83c46adc40551678ba5f2b560ef073cd60ddb0fa53b21a9
+EBUILD ntpsec-1.2.1-r5.ebuild 4731 BLAKE2B db85ef6514e13677bb2c405600c002e8c969771c0ae61495a272792ffde4331fb4d5f8abb219489e2e4d3131608f21a0447a900bfa6f48c1cd55c3e16e5b0251 SHA512 eb81825a8d3fbac628729b9f322cc88c0d68715627149fadf31bae01407536b75253467380edda64ce40b9e97b9346f0a5a1f86a7e840d2b5a9afe36f8ae69ca
+EBUILD ntpsec-1.2.1-r6.ebuild 4406 BLAKE2B b0e1cefb7748ea8c115270543915cc7bdde4dc060ec5f36730df635613b0ec84e0c2a26e6a7aecb438e8379a8552bd1729fffab74d1e5cef156b633b507a9018 SHA512 4ec946fad4fcac345be239cecebbd56c1a17c6259cac2d4747e8266f4937cf3f4c2c59d1e9a3b9634ad9f9475c55bcbacc0f6520b04ca73541b926551489fe6c
+EBUILD ntpsec-9999.ebuild 4168 BLAKE2B d92e57770bd9a46330ff6057de0a2706745c48a4bf0c53921065e70cd059266af78c6d48c551391f0535679a7cdca017e8227e6d54aea7e3ee6f20d469521f0d SHA512 2dcd85192a8359975483500e31c501fec3f40fbb9c93ce60503779b51de4256aad3e8a375ef19df3eaaa1ac683af77fafcce62e2fc6053ed58ea03dcdd7baada
 MISC metadata.xml 1902 BLAKE2B d807dc3dae199835bfa1624e76b43e39a1392f07d736ab5936c48bd4cfd69fdc1bae71a02c3cd9f405aa0992e7ebe27f5ffb639eafed027deba96eaa99ace391 SHA512 a29e4dfebcda69c393487ccfccdefd2b9e4e5c63591d2ed7c008b54b7c04afea071938fd2e0ce6c67f26ccecf427053b1a2b8e946dfcc3e092f64d00bc28aadf
diff --git a/net-misc/ntpsec/files/ntpd.rc-r3 b/net-misc/ntpsec/files/ntpd.rc-r3
new file mode 100644
index 000000000000..68d07237455c
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd.rc-r3
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntpd - the network time protocol daemon"
+pidfile="/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS}"
+command_args_background="-p ${pidfile}"
+command_args_foreground="-n"
+
+depend() {
+	use net dns logger
+	after ntp-client
+}
+
+start_pre() {
+	if [ ! -f /etc/ntp.conf ] ; then
+		eerror "Please create /etc/ntp.conf"
+		return 1
+	fi
+	return 0
+}
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
new file mode 100644
index 000000000000..5b7a4e51374c
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
@@ -0,0 +1,34 @@
+https://gitlab.com/NTPsec/ntpsec/-/commit/a49d53b7fe1d
+https://bugs.gentoo.org/851531
+
+From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
+Date: Sat, 11 Jun 2022 15:16:15 +0200
+Subject: [PATCH] ntpd/ntp_sandbox.c: allow readv() for glibc nscd
+ getaddrinfo() provider
+
+Otherwise, ntpd crashes from time to time with the following stack trace:
+#0  0x00007f5763bfac4d in readv () from /lib64/libc.so.6
+#1  0x00007f5763c48b4c in __readvall () from /lib64/libc.so.6
+#2  0x00007f5763c467ed in nscd_gethst_r () from /lib64/libc.so.6
+#3  0x00007f5763c46c0d in __nscd_gethostbyname2_r () from /lib64/libc.so.6
+#4  0x00007f5763c15a2a in gethostbyname2_r () from /lib64/libc.so.6
+#5  0x00007f5763bed3ca in gaih_inet.constprop () from /lib64/libc.so.6
+#6  0x00007f5763bee225 in getaddrinfo () from /lib64/libc.so.6
+#7  0x000055fcf0ad6544 in open_TCP_socket ()
+#8  0x000055fcf0ad79b4 in nts_probe ()
+#9  0x000055fcf0ac37c4 in dns_lookup ()
+#10 0x00007f5763b8205a in start_thread () from /lib64/libc.so.6
+#11 0x00007f5763c05d1c in clone3 () from /lib64/libc.so.6
+
+Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
+--- a/ntpd/ntp_sandbox.c
++++ b/ntpd/ntp_sandbox.c
+@@ -357,6 +357,7 @@ int scmp_sc[] = {
+ 	SCMP_SYS(poll),
+ 	SCMP_SYS(pselect6),
+ 	SCMP_SYS(read),
++	SCMP_SYS(readv),	/* nscd getaddrinfo() provider */
+ 	SCMP_SYS(recvfrom),    /* Comment this out for testing.
+ 				* It will die on the first reply.
+ 				* (Or maybe sooner if a request arrives.)
+GitLab
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
index 69d38d6263b9..93bcb0332fab 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
new file mode 100644
index 000000000000..c6da1c0300fc
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="${PYTHON_DEPS}
+	dev-libs/openssl:=
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-libs/libcap
+	libbsd? ( dev-libs/libbsd:0= )
+	seccomp? ( sys-libs/libseccomp )
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
+BDEPEND=">=app-text/asciidoc-8.6.8
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
+	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
+	"${FILESDIR}/${PN}-py3-test-clarify.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript || die
+	if ! use libbsd ; then
+		eapply "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--notests
+		--nopyc
+		--nopyo
+		--enable-pylib ext
+		--refclock="${CLOCKSTRING}"
+		#--build-epoch="$(date +%s)"
+		$(use doc	|| echo "--disable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile --notests
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_test() {
+	python_compile() {
+		waf-utils_src_compile check
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+python_test() {
+	# Silence QA warning as we're running tests via src_test anyway.
+	:;
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install --notests
+		python_fix_shebang "${ED}"
+	}
+	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
new file mode 100644
index 000000000000..faba59c221e6
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="${PYTHON_DEPS}
+	dev-libs/openssl:=
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-libs/libcap
+	libbsd? ( dev-libs/libbsd:0= )
+	seccomp? ( sys-libs/libseccomp )
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
+BDEPEND=">=app-text/asciidoc-8.6.8
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
+	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
+	"${FILESDIR}/${PN}-py3-test-clarify.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript || die
+	if ! use libbsd ; then
+		eapply "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--notests
+		--nopyc
+		--nopyo
+		--enable-pylib ext
+		--refclock="${CLOCKSTRING}"
+		#--build-epoch="$(date +%s)"
+		$(use doc	|| echo "--disable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile --notests
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_test() {
+	python_compile() {
+		waf-utils_src_compile check
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+python_test() {
+	# Silence QA warning as we're running tests via src_test anyway.
+	:;
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install --notests
+		python_fix_shebang "${ED}"
+	}
+	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
new file mode 100644
index 000000000000..b163db94a45f
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="${PYTHON_DEPS}
+	dev-libs/openssl:=
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-libs/libcap
+	libbsd? ( dev-libs/libbsd:0= )
+	seccomp? ( sys-libs/libseccomp )
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
+BDEPEND=">=app-text/asciidoc-8.6.8
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
+	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
+	"${FILESDIR}/${PN}-py3-test-clarify.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript || die
+	if ! use libbsd ; then
+		eapply "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	myconf=(
+		--notests
+		--nopyc
+		--nopyo
+		--enable-pylib ext
+		--refclock="${CLOCKSTRING}"
+		#--build-epoch="$(date +%s)"
+		$(use doc	|| echo "--disable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	distutils-r1_src_configure
+}
+
+python_configure() {
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+python_compile() {
+	unset MAKEOPTS
+	waf-utils_src_compile --notests
+}
+
+python_test() {
+	waf-utils_src_compile check
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+python_install() {
+	waf-utils_src_install --notests
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 4d49e9065f2e..c5b75b26451e 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -54,7 +54,6 @@ BDEPEND=">=app-text/asciidoc-8.6.8
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-py3-test-clarify.patch"
 )
 
 WAF_BINARY="${S}/waf"
@@ -87,7 +86,7 @@ src_configure() {
 	done
 	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
 
-	local myconf=(
+	myconf=(
 		--notests
 		--nopyc
 		--nopyo
@@ -103,45 +102,30 @@ src_configure() {
 		$(use debug	&& echo "--enable-debug")
 	)
 
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
+	distutils-r1_src_configure
 }
 
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile --notests
-	}
-	python_foreach_impl run_in_build_dir python_compile
+python_configure() {
+	waf-utils_src_configure "${myconf[@]}"
 }
 
-src_test() {
-	python_compile() {
-		waf-utils_src_compile check
-	}
-	python_foreach_impl run_in_build_dir python_compile
+python_compile() {
+	unset MAKEOPTS
+	waf-utils_src_compile --notests
 }
 
 python_test() {
-	# Silence QA warning as we're running tests via src_test anyway.
-	:;
+	waf-utils_src_compile check
 }
 
 src_install() {
-	python_install() {
-		waf-utils_src_install --notests
-		python_fix_shebang "${ED}"
-	}
-	python_foreach_impl run_in_build_dir python_install
-	python_foreach_impl python_optimize
+	distutils-r1_src_install
 
 	# Install heat generating scripts
 	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
 
 	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
 	newconfd "${FILESDIR}"/ntpd.confd ntp
 
 	# Install the systemd unit file
@@ -165,6 +149,12 @@ src_install() {
 	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
 }
 
+python_install() {
+	waf-utils_src_install --notests
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
 pkg_postinst() {
 	einfo "If you want to serve time on your local network, then"
 	einfo "you should disable all the ref_clocks unless you have"
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index e974ab0567d5..0f56b47fd70c 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -2,5 +2,5 @@ AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241
 DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589
 DIST ofono-1.34.tar.xz 1060828 BLAKE2B be0d3787ca9226763fb2bff46f1c3cec813d702730d6231986ec5aa43e2d96e08385fa3f64ccff97cf15844e41a33d6c37d1d35c8b0c5fcf3765848e258e3372 SHA512 79ebf0bc795288f07b58eeaa1a0aa3309b4afecae3abdd26c0749e22a4c2e74b65e93cbcfdfd1738dbcb2d0cfb8c687d182d706696a7c1cd5b4ed3bcec059489
 EBUILD ofono-1.33.ebuild 1635 BLAKE2B 2ec579c72af17add304ccd2b4945a21c9fd5725907e93e3457d3f9504ef9d6ecd868a2b7a43c49c5ee6411de12266677d14ce51f31d9808573c453cb98211303 SHA512 bcaeb56d9a37cc0bb35d45f553b1c930c9a7d1cbca604a0ce862769dcd298ee784be9f885f59a009bf1c35baf1b79b7723208d99050b99767e07ca9e871c872d
-EBUILD ofono-1.34.ebuild 1642 BLAKE2B 4fec94e65e7f613febb35e118ef6670b3cba3dffd7961002079239ff54054a59cd71248ec6409f415abc45a1dafb9aa858ed8e3e7234c5848dad823d0cb3f160 SHA512 beb1c80eae1dcbc666c86157e8499c8f7570da72aa8456cf8a14da5353b33a47756c6df835d475287dee034ba887a19741310ffc9632a0c90eb33f7b0dd0db10
+EBUILD ofono-1.34.ebuild 1649 BLAKE2B c326d9205f5bbc9cae979bf200a71a93adb9d0b1a713eeae3e3ee43c3910b5581b40acd0a012e99ea304d59e751b7e76b47969ed8be8a362bcd4be16573fbdd3 SHA512 a6dc0c22d953c6ced714ec62a5a88360b167f553bd6858e2928160374317b80d3872ccafdadaf80036f2a4da51303097473e94f808a228e15988631236edf84e
 MISC metadata.xml 952 BLAKE2B 9980756397330c03bd0f21db6d44e4af119135b9a864d4cdc97a697e7f0013051985c7db3c48d8d17bd592cfaf185a81add398d3e0a3ddc64aa61979a1603d5e SHA512 a745e9cf9a89e3c989cd950651c3d914ffe17e34f32f9623c468127011c6faa35942484d24c34c217b614b295743120a035a56aa30ae79343a72ba5cfbc462f0
diff --git a/net-misc/ofono/ofono-1.34.ebuild b/net-misc/ofono/ofono-1.34.ebuild
index 1afaf2e3612b..ea773ff8c414 100644
--- a/net-misc/ofono/ofono-1.34.ebuild
+++ b/net-misc/ofono/ofono-1.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index cac07b17284e..3d0cdc503a04 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,4 +1,6 @@
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
+DIST omniORB-4.3.0.tar.bz2 2762061 BLAKE2B f9103080011a7e683b7e63f6553e8a60947820a331d7c4e3559c961a7f36b17e235c5808e7b282d0227343e6e794106b9f2b93bf138b1a919716d1338e1c9cc2 SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
 EBUILD omniORB-4.2.4.ebuild 2356 BLAKE2B a245ac15e187ed3a520ed6c41d3673dfacc72b9ba94e9b4764b932627fcaf1b5915aa5af80d737e69d15703b0d2ee0b589c43d508bb7897680e697538480149d SHA512 25d9491129305db575442b6d732530048ae24c411224098dcf5633efcb1747e98c2cd900f769fc1e92371d0298eb7c41322d63b7f45ebeca8df68c336dacc36c
-MISC metadata.xml 248 BLAKE2B 6b95a9a2c894490085abcf451cc5d598f356cb34085ae0a247c4c3d4943a472c947983bf2f90242bb949e09485f95a4f7a368593a24f1638606c2bbb9a12e8fa SHA512 b1b79973bfd62795feea524b26a30a5e00b230d3f6416f94cd912899d8b1e22aa3a78e71f8333382a19a41a112e21b0af17b88993b137a87c5b38f81028e6670
+EBUILD omniORB-4.3.0.ebuild 2338 BLAKE2B 81b4181cf5389a16caee3df78ff2087dd23d4d9de2bc1ade1e01614dbb3fbb290c87833cb6c9e24cf135fd7884df4cac7680dc96a1b5506a1e10e04f96e9789d SHA512 dc84d1bef1aa5aec6e9991aff4eb19a331c4d5b929491a6c9a301354017b84fc5f989f121d9630faf361e40ecb6da364012f8bb011d7a257e50ff44d8261d4b8
+MISC metadata.xml 480 BLAKE2B 18c6b730f8a61f23ca0141f021af7106bcb9d47d66b9bebccf2caecb242b01e9256458da34b2a76d6451ef5f19e926c4c0362ade9a0bfff0dc5384c2f2949de2 SHA512 ee60840029f943440643b41e21daf17edb0c74e56210ce753ffcd0628aa5fc3191101f4c1b53a9b275df78cb8afddcca9c82795ea632cc1e2946fd0e371b33d7
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index fb1b00f74288..2178b72656c8 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="sourceforge">omniorb</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>aliens.satin0y@icloud.com</email>
+		<name>Thomas Juerges</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">omniorb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/omniORB/omniORB-4.3.0.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild
new file mode 100644
index 000000000000..2ba601fe4528
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.3.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1
+
+MY_P="${P/_p/-}"
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# The OPTC(XX)FLAGS variables aren't present in these files, but we
+	# will set them when we call emake.
+	sed \
+		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+		-i mk/beforeauto.mk.in mk/unix.mk || \
+		die "failed to switch CFLAGS variables in the makefile includes"
+
+	# The out-of-source build is suggested by upstream.
+	mkdir build || die "failed to create build directory"
+}
+
+src_configure() {
+	cd build || die "failed to change into the build directory"
+
+	ECONF_SOURCE=".." econf \
+				--disable-static \
+				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
+				--with-omniNames-logdir=/var/log/omniORB \
+				--libdir="/usr/$(get_libdir)" \
+				$(use_enable ipv6) \
+				$(use_with ssl openssl "/usr")
+}
+
+src_compile() {
+	cd build || die "failed to change into the build directory"
+	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	cd build || die "failed to change into the build directory"
+	default
+
+	rm "${ED}/usr/bin/omniidlrun.py" || \
+		die "failed to remove redundant omniidlrun.py"
+
+	cd "${S}" || die "failed to change into the ${S} directory"
+
+	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
+	dodoc -r doc/omniORB
+
+	if use doc; then
+		dodoc doc/*.pdf
+	fi
+
+	cat <<- EOF > "${T}/90omniORB"
+		PATH="/usr/share/omniORB/bin/scripts"
+		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+	EOF
+	doenvd "${T}/90omniORB"
+	doinitd "${FILESDIR}"/omniNames
+
+	cp "sample.cfg" "${T}/omniORB.cfg" || die
+	cat <<- EOF >> "${T}/omniORB.cfg"
+		# resolve the omniNames running on localhost
+		InitRef = NameService=corbaname::localhost
+	EOF
+	insinto /etc/omniorb
+	doins "${T}"/omniORB.cfg
+
+	keepdir /var/log/omniORB
+
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/omniidl
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b0b04a66e42b..97263897a7cb 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -13,6 +13,8 @@ AUX openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 419 BLAKE2B c5ef82ed92da96213c84d
 AUX openssh-8.9_p1-hpn-15.2-X509-glue.patch 15810 BLAKE2B 5ef56bee2ce09033d86c5f99a0956d5e3f268dcf18cc4bb32c75de9e81c3873efe643c39d155188cca4812e677223d66621b061897308ed66bbbc1793343519e SHA512 a1903c6ab7842a14d1324e6ea3b1a25cc161e564092ed4679b333a081f1659712a519335fb2cfbdd344bded47a00d538bb5b5a9bfd2e82a321a8347cfeb5bb16
 AUX openssh-8.9_p1-hpn-15.2-glue.patch 8473 BLAKE2B a4616e498db7400702b3c0ba8c6eb6d58b198b1104215b91c0938bb68bf15850f63e3f32e4b99af04ae78ef60818127e17cab68dc3e3bbfe696545057ef3ec63 SHA512 ceff7521accb464c916b5aa695c80de5760272da319f537dc93bb6b6e39de1d408ba4a5335b4071091afb360c5cf44d91429109f84f1e669a175beb3cfcecd26
 AUX openssh-9.0_p1-X509-glue-13.3.2.patch 2118 BLAKE2B 8d7211b713025dc2749b58907dce8fd9bc415f92a90041b9daae0b80401b91095b7160b5105634fb7c578af12d425863ea85bab4a59dec5d6a9746fbba603a65 SHA512 681d457457fd2a2709c34d7df0eee93a6602532b79b4ceb17f937e0639ded0efd786fdf2002c48a9a52594eae305bd818ae6ee9cc9bf192e619e19bf553be2ae
+AUX openssh-9.0_p1-X509-glue-13.4.1.patch 2118 BLAKE2B 171c776e8a1dc64dd63d0e471dd7064fb0360a4abdec7f03915246f07082341e6b505e7a5467aad25bd5282ab4a63a48405984317b12c1692d04f5427503a86b SHA512 7dc1c43e6f70a4c990dc3cf493f8a5b4fbdf1753f2d4bf474ba40adb656d843fcf72a4e076e6450e0488ada68758f9e2e0814a71388d552ce50d34c3692e573d
+AUX openssh-9.0_p1-X509-uninitialized-delay.patch 321 BLAKE2B 19bff0fc7ecdc6350f8e6bd30f36f30b455c65b7455fe8b1d481d8fa7cdfa7cc76719931857fe2c9730b05ae8fe3e7e05c538e743e055d6594dd2fc7c3f250ee SHA512 57798621a51a60abf6985391ec73dcafdb46de75c93579e23b786aa095d8eea29ebd9ab5987b951a136b15e60896332c9717c82b42e1c22b345444aedf17a9f5
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
@@ -27,9 +29,11 @@ DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
 DIST openssh-9.0p1+x509-13.3.2.diff.gz 1128591 BLAKE2B fb560e2f1803ceb946a1ba8bd53a1f9fd262896b820c23d4b0015218433d2200f1fd9df5b1889a670261f13936d8153da1ab4beb2a5d52ede78168189c522bf3 SHA512 e643168d7098c44f85a9bac9894a936a3480ec843162197ce56e016dd4f634ef182dcfae1f7e18408f6a18832e0a95d2d249a23fdbc3dc46df76989ca0a0c7fc
+DIST openssh-9.0p1+x509-13.4.1.diff.gz 1146757 BLAKE2B 070d6bc23179a581e4fe79412274f11399009ba69ad643cc354ec9cd6392ffb0a651fd2d7f310c52c60a9c626140b9c823e2f19c600f15ac9cdf992707274bcb SHA512 4aaa86c1a785741b28c5e2738cf6de6fa7965ac8692165a8b18fe7677aeb0996979f23b45306781e6be75d34fb39294659be5ae016ab4a82ef2a73bedcc6e8e7
 DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3
 DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9
 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
-EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B d43c27180c5ea6242d3942c375da7714c915c8a7c7b50b80a963c48db6bbb100e7f7d892bcf031b62527fffc570e44ee527bc24e22e4e3611b68909ec4b24111 SHA512 88a6668e89bec99acb58890b19c744b2e194e7c7f30cdfcf8907f7ee0d8f63c986647fac1ee09394437597d27dee9392d25912b5b0470d9a31ff8e76d6f15f8b
-EBUILD openssh-9.0_p1.ebuild 16870 BLAKE2B 143e4901b4dabbb1aaa7c83ecaf98618f356636f6eca747ff2ad939d9237f8dcd8b56835216fa712878f5c8efaa4ca33346f963473e4381954358e3c8870d5b0 SHA512 fa6433bc13fc8c78a42eb73c62bd4b16bf5e95bbd5d10d7dfa1a888d3fb807def36eca98491b60da03f31795014593b62f06cdfd1fce8f8b034fe9cd15da2aad
+EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
+EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772
+EBUILD openssh-9.0_p1-r2.ebuild 16937 BLAKE2B a87e2567925aa66ab898ec130951822b21087fcfcd28cd9cf5ca61a4281f89e55ca585811cc6241fd2f8a5b26bfcb1b8f07c4d08f4f545039119915b901264a2 SHA512 5e55cefd3da1d9f348f298687dd549d59a96527a91eaa8d007eecefe5c4cf85c91b74fba5e0f0fd91f41e372b0f6722b626695bad568bf6e294f07300276680f
 MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
new file mode 100644
index 000000000000..dc93182e1d4c
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
@@ -0,0 +1,54 @@
+diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.4.1.diff b/openssh-9.0p1+x509-13.4.1.diff
+--- a/openssh-9.0p1+x509-13.4.1.diff	2022-06-23 10:43:33.957093896 -0700
++++ b/openssh-9.0p1+x509-13.4.1.diff	2022-06-23 10:44:17.232396805 -0700
+@@ -48941,8 +48941,8 @@
+  		gss_create_empty_oid_set(&status, &oidset);
+  		gss_add_oid_set_member(&status, ctx->oid, &oidset);
+  
+--		if (gethostname(lname, MAXHOSTNAMELEN)) {
+-+		if (gethostname(lname, MAXHOSTNAMELEN) == -1) {
++-		if (gethostname(lname, HOST_NAME_MAX)) {
+++		if (gethostname(lname, HOST_NAME_MAX) == -1) {
+  			gss_release_oid_set(&status, &oidset);
+  			return (-1);
+  		}
+@@ -57102,12 +57102,11 @@
+  
+  install-files:
+  	$(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -395,6 +372,8 @@
++@@ -395,6 +372,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -78638,7 +78637,7 @@
+ +if test "$sshd_type" = "pkix" ; then
+ +  unset_arg=''
+ +else
+-+  unset_arg=none
+++  unset_arg=''
+ +fi
+ +
+  cat > $OBJ/sshd_config.i << _EOF
+@@ -143777,16 +143776,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	    __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.4.1/version.h
+---- openssh-9.0p1/version.h	2022-04-06 03:47:48.000000000 +0300
+-+++ openssh-9.0p1+x509-13.4.1/version.h	2022-06-23 09:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_9.0"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.4.1/version.m4
+ --- openssh-9.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-9.0p1+x509-13.4.1/version.m4	2022-06-23 09:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch
new file mode 100644
index 000000000000..2a83ed37d138
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch
@@ -0,0 +1,12 @@
+diff -ur a/auth2.c b/auth2.c
+--- a/auth2.c	2022-05-19 15:59:32.875160028 -0700
++++ b/auth2.c	2022-05-19 16:03:44.291594908 -0700
+@@ -226,7 +226,7 @@
+ 	int digest_alg;
+ 	size_t len;
+ 	u_char *hash;
+-	double delay;
++	double delay = 0;
+ 
+ 	digest_alg = ssh_digest_maxbytes();
+ 	if (len = ssh_digest_bytes(digest_alg) > 0) {
diff --git a/net-misc/openssh/openssh-8.9_p1-r2.ebuild b/net-misc/openssh/openssh-8.9_p1-r2.ebuild
index 7cc0b4d2528a..52bb14990c58 100644
--- a/net-misc/openssh/openssh-8.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.9_p1-r2.ebuild
@@ -20,8 +20,10 @@ HPN_PATCHES=(
 	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
 )
 
-SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.3.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+SCTP_VER="1.2"
+SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="13.3.1"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
diff --git a/net-misc/openssh/openssh-9.0_p1.ebuild b/net-misc/openssh/openssh-9.0_p1-r1.ebuild
index 13c0bb4fa5c5..25e69c941bf4 100644
--- a/net-misc/openssh/openssh-9.0_p1.ebuild
+++ b/net-misc/openssh/openssh-9.0_p1-r1.ebuild
@@ -20,8 +20,10 @@ HPN_PATCHES=(
 	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
 )
 
-SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.3.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+SCTP_VER="1.2"
+SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="13.3.2"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -149,6 +151,7 @@ src_prepare() {
 		popd &>/dev/null || die
 
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
 
 		# We need to patch package version or any X.509 sshd will reject our ssh client
 		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
diff --git a/net-misc/openssh/openssh-9.0_p1-r2.ebuild b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
new file mode 100644
index 000000000000..9402ad203dc3
--- /dev/null
+++ b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2"
+SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="13.4.1"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	hpn? ( ssl )
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl !xmss )
+	xmss? ( ssl  )
+	test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		net-libs/ldns[ecdsa(+),ssl(+)]
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	!prefix? ( sys-apps/shadow )
+	X? ( x11-apps/xauth )
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf
+	verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	local missing=()
+	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
+	check_feature hpn HPN_VER
+	check_feature sctp SCTP_PATCH
+	check_feature X509 X509_PATCH
+	if [[ ${#missing[@]} -ne 0 ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested: ${missing[*]}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "Missing requested third party patch."
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_unpack() {
+	default
+
+	# We don't have signatures for HPN, X509, so we have to write this ourselves
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+	eapply "${FILESDIR}"/${PN}-8.9_p1-allow-ppoll_time64.patch #834019
+	eapply "${FILESDIR}"/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch #834044
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-glue.patch
+		use X509 && eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-X509-glue.patch
+		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
+		$(use_with ssl openssl)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	if use elibc_musl; then
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local tests=( compat-tests )
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		ewarn "user, so we will run a subset only."
+		tests+=( interop-tests )
+	else
+		tests+=( tests )
+	fi
+
+	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
+	mkdir -p "${HOME}"/.ssh || die
+	emake -j1 "${tests[@]}" </dev/null
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index e9c3593cd6d1..ce760f0fd2f1 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,17 +1,11 @@
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
-AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
 AUX ovs-vswitchd-r3.service 904 BLAKE2B 1a9880154a7628c57838a7d0fcf60d3734f35bef36fcaf6e396da92a35fa80a056bb1122d218f0331cc3382c13433672471dba7d7e711fd4f2ced4803b5623fa SHA512 408b52e74dab747bf83c66e43515868eaddb24de6e914c7ed201425cdc24c731b3d705cf9abf2cfc30c2499b77f2795b72d11f31bcfc3237cca0ad13ca17fc63
 AUX ovs-vswitchd.confd-r2 188 BLAKE2B b38ed709f5d59caed9146df078c26b08d85178e7dd783ecc1f431721a23732fdacad77886ab4387ab94121eebca267b1d628f5a3e2f8c95e11f90b8a260a80c6 SHA512 b1afe4a4095ea78e7a58c69a26c0eac6e944594702364d81766944f7470cdbac09922286b8a8f926aad8ff2e14ee6b5311188d2dc22ea2d8bb9cf28034157135
-AUX ovs-vswitchd.service 393 BLAKE2B 6ca53819e5bda787eeefcf94f76749621da3462f2f92ccd70de35ba407b4dd74b29552b609871d77f85ccca764640555167b40b97d6585b80bf3bbfcb1ae242c SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2
 AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01fcc9266c7c0387423a1897d55cd70651c3a0407461c641455869ceefe330cc1880abc2cf79516de6 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5
 AUX ovsdb-server-r3.service 813 BLAKE2B ba16534aaf407121f56e1ffc711dcc87b4c5ee07cc12f74e1d8ca2b7e85fefede4100154ef2031470b68fe5085539984b6b38b8c518fa38a8eb19d8af3a24c1c SHA512 ed3137fb0b26be82f311aa9a56855d91bb113a64fd43ecde8d97979354edffe26ee7712eac91c96b19e56c35a5b4ef2c68acfe5c3c0c0cd21e35745fde41574e
-AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab42fa1c93b079901777bc0e7fca0847427affc5a069e9041297369364f9aa28869f63a463e3646f70f47fd SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19
-AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
 DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
-EBUILD openvswitch-2.14.1.ebuild 4448 BLAKE2B f2621188fe68fddafa7b90b64a0ae9c5fe0352d24758f0fc98994a3c00d34c06f7426f530a03a5d22d0805030741c8792079556b1f514df94a3a6063c5d23e1f SHA512 06299fb3b77d645fc946dd25a224d33d4db478bc9de15b9142131e80c18e3d33943a224d40d62587acd46104c80e80a5b9e422a80e3912e53cf662f54799d789
 EBUILD openvswitch-2.15.0.ebuild 4406 BLAKE2B 2bd8f0c6fa31c291c358666b12bc8a7cee17b8aec4f9860e8cd21d93d671ce318c2e55f6a938b2c406a5892787de3b3e1546eaff16cc7859031e6b6edcf043ea SHA512 8d8ac462e9102b7162c417eab2194601027ee1cbe247ad2bd1b10b828780ad2bebe8991addee49ff4f31358c560e946e7f3a73a2cc60d2dc148eb6e55d6ecf8b
 MISC metadata.xml 459 BLAKE2B b404d36a797768044b82701f1d65c2931b33d2ddb553dcc56cd476686d66102988a863261a6afd05c366b3e0521959e3c4b3af2cc1751899ecc386adf458fb12 SHA512 1b11fe7e1e1d117f60eb24da05c27a2b3e431dc4c46ea8e97cff69cef8747f110be6ae7e6a83fcb604a75954c7c2133139e052823620bdf1b010f8c4f8b0f931
diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service
deleted file mode 100644
index 4cd4d7f57f97..000000000000
--- a/net-misc/openvswitch/files/ovs-delete-transient-ports.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Open vSwitch Delete Transient Ports
-After=ovsdb-server.service
-Before=ovs-vswitchd.service
-AssertPathExists=/var/run/openvswitch/db.sock
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports
diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service
deleted file mode 100644
index a573a503e14c..000000000000
--- a/net-misc/openvswitch/files/ovs-vswitchd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Open vSwitch Daemon
-Documentation=man:ovs-vswitchd
-Wants=network.target
-Before=network.target
-Requires=ovsdb-server.service
-After=ovsdb-server.service
-
-[Service]
-# --pidfile options is needed for create file used
-# by ovs-appctl command.
-ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service
deleted file mode 100644
index 9493c40755d8..000000000000
--- a/net-misc/openvswitch/files/ovsdb-server.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Open vSwitch Database Server
-Documentation=man:ovsdb-server
-
-[Service]
-# The file can be shared for this as this values are prone to change
-# and that way we don't need to update them in two different places
-EnvironmentFile=/etc/conf.d/ovsdb-server
-ExecStart=/usr/sbin/ovsdb-server --monitor \
-		--remote=punix:${DB_SOCKET} \
-		--remote=${REMOTE_DB} \
-		--private-key=${PRIVATE_KEY} \
-		--certificate=${CERTIFICATE} \
-		--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}
diff --git a/net-misc/openvswitch/files/ovsdb-server_conf b/net-misc/openvswitch/files/ovsdb-server_conf
deleted file mode 100644
index 1299b820640c..000000000000
--- a/net-misc/openvswitch/files/ovsdb-server_conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Socket for bringing the server up
-DB_SOCKET="/var/run/openvswitch/db.sock"
-
-# Remote sockets are defined in the database by default
-REMOTE_DB="db:Open_vSwitch,manager_options"
-
-# All certificates and keys are stored in the database (if any)
-PRIVATE_KEY="db:SSL,private_key"
-CERTIFICATE="db:SSL,certificate"
-BOOTSTRAP_CA_CERT="db:SSL,ca_cert"
-
-# Alternative path for the database (default is /etc/openvswitch/conf.db)
-# DATABASE="/etc/openvswitch/conf.db"
-
-# Additional options
-# OPTIONS=""
diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild
deleted file mode 100644
index c873cc5a5478..000000000000
--- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.13.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="
-	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		# docs state 4.17.x code states 4.15.x
-		kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	tmpfiles_process openvswitch.conf
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 74393c454e04..fe82906ba664 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,5 @@
 DIST ownCloud-2.10.0.6519.tar.xz 5791912 BLAKE2B 3cf02ef89a6af249ab8f9d1b0a4cc899fbb11f49bf47ffb0ce042442da984d8dbf49619cf3344cf1837f1f3437e70f6e6d302f4e4c67a7df5f547368be4252ba SHA512 ab1e8aebefa049a73c436325b3b6e1d03e9a74f93ab6e090adbc71ccdd1cf56297898f004b12312ebba82158f5c2e299d9d0b13c14e291b855dcf267bac490f2
-DIST ownCloud-2.9.2.6206.tar.xz 5759996 BLAKE2B c328ea261a4fddecf93837dbcac01aab0971542d8dfb3f5b0a32a8432ca0e0904c3f4fc81c5c7811da8b3af64b58e929c055e7cec0649f00049e037372948eec SHA512 d075a11ee92aa9771c631a766feddfa1a70907d7d341b58043e1ba96ac52786a6a750b15c2f9b7a0992fe02a45586cc3445755dc9df4cd267e72f070d2222f0f
+DIST ownCloud-2.10.1.7389.tar.xz 5598044 BLAKE2B 8558a8a7b7bd4b8a0685b703f0882d6b5619c4902217d40feb4cf5587555b9a85363c7f61834e4c85a84789142fca8c73910fce66544f491ec5968818c816605 SHA512 2a0893d48786b88f8210966a2b6b48f5bdada82818d4115e68ecc6c0c926ba62bc74df03c4ab35eb271aef2f3a43b36b1a6a115585efe3739fd4a6164f9c45a1
 EBUILD owncloud-client-2.10.0.6519.ebuild 1500 BLAKE2B b2c5646495e909e5598066e1fcdaf87a86b7e7ebf6bc35c0591f0c1ffbc995234ddee3fbe032f3dc8c583898071be8bcfa476c2ef258bb421a9db72c27d2076e SHA512 bd55ab513cfb309094dfdcba9308341ebd010b80ffe8ddcea45d7895cb34c10e26675ac00e3ced04075f9ef6f740d7bb439db0d5eaaae42863e1da65876cb1af
-EBUILD owncloud-client-2.9.2.6206.ebuild 1500 BLAKE2B a696ee5d555770f7b0fa2e2d84a41765ee3d30c845a0fbc4ac21a94e22168b48de93873b1cf96db01e4f1ddd84b30e1230cc4df9fff66479c4fe12fb76ac5cdf SHA512 1801423f8e5bba0c5985dfb439e2a7e774704bc83dbfd41f3314ee625ab444be0f7e9ca0665c4beae6824012696e7410b9ebee51d11004a60bd8a2657b0eea1d
+EBUILD owncloud-client-2.10.1.7389.ebuild 1500 BLAKE2B b2c5646495e909e5598066e1fcdaf87a86b7e7ebf6bc35c0591f0c1ffbc995234ddee3fbe032f3dc8c583898071be8bcfa476c2ef258bb421a9db72c27d2076e SHA512 bd55ab513cfb309094dfdcba9308341ebd010b80ffe8ddcea45d7895cb34c10e26675ac00e3ced04075f9ef6f740d7bb439db0d5eaaae42863e1da65876cb1af
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
index 1f71bd2d5125..e75c66fabf69 100644
--- a/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index b65ca769cafd..bf5189b3fa1c 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,3 @@
 DIST pssh-2.3.4.tar.gz 51859 BLAKE2B 788f5239cd35e240cc1961e73b532c60e5221ede9de48878f9636339b18235dc67109948eeb4f64871985bb24e1a7f823b1718da3dbe2ea893af58fd45495c61 SHA512 7abf327ca53dda2402465254e447eb837babdd2b4d865abb5b52a1135bd234694b84c1148cb3e4ed0198271ed29333fc1b5d0d01dc653fcf6d3e5b9f170b9d4e
-EBUILD pssh-2.3.4-r1.ebuild 745 BLAKE2B 8761772bc14e87b6d73026aa96575cbf2c845b9e15c4fb19d510044d585d86df8d766a986efe937f9eab4e74f2ed20221b6fcd3903bd9cb7db7e564bb3b4e246 SHA512 736deeac3f85339afc5758ff8ce3d1359bb5381ad1a00ccc5bef93048536e71be2eb4e37fcde170f711dfc5049cd2c51d4e1fc0fe8e62a5396b76a4d3506c446
+EBUILD pssh-2.3.4-r1.ebuild 746 BLAKE2B d1b8fb738b09e647be1819f466290ae0000b586c08d19e1d8cfd99983349beb38c3a5df8ffb827454af06b762a090447dae3f799ffe55055f6bb1720e4ddf1a0 SHA512 ff68771a11a1d167814d91246d5f75d801ba4d090f6eb3d9788e28d7bd138d82ddfd284d5d11bedf8974b379cfc22c5478f50dcdf542257c05fa59e61ae6f22c
 MISC metadata.xml 415 BLAKE2B 86f4588a2dc1da92bbe426b844de02c18a87ff1b8f4566c63f48854e8b38ed014530e4d63b96a44feb6d1f41477ff9317a1b434eb74c83dc995f24ef2d7cfab3 SHA512 113cc042c12d46038f0a9f441cb9fd40f91d3c7b668bc9949786eb755754a45f17fcb478948fb21e7f669617a393939566c187ca06342e10017718384873bb04
diff --git a/net-misc/pssh/pssh-2.3.4-r1.ebuild b/net-misc/pssh/pssh-2.3.4-r1.ebuild
index 81921416658f..78373cfe0d29 100644
--- a/net-misc/pssh/pssh-2.3.4-r1.ebuild
+++ b/net-misc/pssh/pssh-2.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index ed97830d7f5b..c99bbe87d180 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
+DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.76.ebuild 1702 BLAKE2B bf252a9a45fd62cd5c791c99ecfd055e2343ccdb75ab5dc3a21f7738aa2ad2014b7a8e203dbd4030aae05311ad87394af83eb9efe8c0bb65d563383e9bb59beb SHA512 0e5d4e5507610e9d905e5e9c0304747d07002618c698c6b73413e82302c3b12c4ce8b66dd1aa9101c36e39d1bcc63185d124a7e81657f9900193574d19b93883
-EBUILD putty-9999.ebuild 1748 BLAKE2B c19463b704de38bc5226c6f37b58aeabeb888a85f5cfcdbed00d32f525241daca1b7382a7f7f0a7c86fbbd1c2ccda92481a209e353afd6760c9b9dcc14441af1 SHA512 f18023f6866e116aae2b6cc9aa92cd3421942d6396768321bc44da8f88292ea50a38999053bb015914cc23af37d52b275cb0d7dad7c7a5ec15412ffe7f70ed23
-MISC metadata.xml 1011 BLAKE2B a759a93b5f4affdefc2ad81edd6a9c15fa31feb5b549d23a56114e7a9937bef6e60aa6b630fba223043cd0909e8052dcb3f1e848199399aa1f249b9d4dd59715 SHA512 3c48cbb3dff26aee751960ceccb5214c97adb60c68eb67fe69a2c6ffa059b2defeb66623e85da970c4fa0668fafa5c4b61404685fcc3e6d5b803944d11ea9bf9
+EBUILD putty-0.77.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
+EBUILD putty-9999.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
+MISC metadata.xml 927 BLAKE2B b16050f046b27ee7798fe2a59f80cb5d0b6e76e0facef049d17b67c955986af99fa16d705ee22bba3282ee968e3b1986fdfead3ba51664e9eacbbb8c0e4dba62 SHA512 6241b2e460a8b7bb195712f3cdd2200984e7e2e185c73e9630badca12ff2e01d345467d97c93d8ba79a801d14eb906fc9dfdbc0ef9c7f411fa2cd33abff752fe
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 56d8ef2b4271..d1187ee7285b 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
 		platforms, along with an xterm terminal emulator. It supports flexible terminal
diff --git a/net-misc/putty/putty-0.77.ebuild b/net-misc/putty/putty-0.77.ebuild
new file mode 100644
index 000000000000..a09ae7ae4600
--- /dev/null
+++ b/net-misc/putty/putty-0.77.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake desktop xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
+else
+	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="MIT"
+
+SLOT="0"
+IUSE="debug +gtk gtk2 ipv6 gssapi"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libX11
+		x11-libs/pango
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3[X] )
+	)
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+"
+#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
+
+REQUIRED_USE="
+	gtk2? ( gtk )
+"
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	default
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	local mycmakeargs=(
+		-DPUTTY_DEBUG="$(usex debug)"
+		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
+		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+		-DPUTTY_IPV6="$(usex ipv6)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	doman "${BUILD_DIR}"/doc/*.1
+
+	#if use doc ; then
+	#	docinto html
+	#	dodoc "${BUILD_DIR}"/doc/html/*.html
+	#fi
+
+	if use gtk ; then
+		local i
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} \
+				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+				${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 97dbfaea150f..a09ae7ae4600 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools desktop git-r3 toolchain-funcs xdg-utils
+EAPI=8
+inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
+else
+	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS=""
-IUSE="doc +gtk gtk2 ipv6 gssapi"
+IUSE="debug +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -30,62 +35,47 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	app-doc/halibut
 	dev-lang/perl
 	virtual/pkgconfig
 "
+#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
+
 REQUIRED_USE="
 	gtk2? ( gtk )
 "
 
 src_unpack() {
-	git-r3_src_unpack
-	default
-}
-
-src_prepare() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	./mkfiles.pl || die
-
-	eautoreconf
 }
 
 src_configure() {
 	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR="$(tc-getAR)" $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_test() {
-	emake -C unix cgtest
-	unix/cgtest || die
+	local mycmakeargs=(
+		-DPUTTY_DEBUG="$(usex debug)"
+		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
+		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+		-DPUTTY_IPV6="$(usex ipv6)"
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	dodoc doc/puttydoc.txt
+	cmake_src_install
 
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
+	doman "${BUILD_DIR}"/doc/*.1
 
-	cd "${S}"/unix || die
-	default
+	#if use doc ; then
+	#	docinto html
+	#	dodoc "${BUILD_DIR}"/doc/html/*.html
+	#fi
 
 	if use gtk ; then
+		local i
 		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+			newicon -s ${i} \
+				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+				${PN}.png
 		done
 
 		# install desktop file provided by Gustav Schaffter in #49577
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 323954b14c1c..09a4ed23e108 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,3 +1,3 @@
 DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc
-EBUILD python-x2go-0.6.1.3.ebuild 575 BLAKE2B 5fbe001e5c100f1c4405a3fafe36eaabdad89710551843c49724bbbe490f594cf14eb813cd7d005f010076ce8ef60dcba2da2b52e9a650fbd9e70b0c1c24d160 SHA512 e02f430a40b2532f90c3ecdf6565798e9da25eb01a926312c7e1b12405fa750407c4e2f47ebbfb4113016af928b6e9ef0421953e57814f0ef3e6ae62380f99e4
+EBUILD python-x2go-0.6.1.3.ebuild 576 BLAKE2B ca4ae59a441970c3d271ef13ea43bf2f9adaa366e2dc0d31445a864e5bca7fb12142f40fa19c09f5143d340a66638a31d23d1eab11354d5403c890517e9a9b11 SHA512 eabee37559cbb264017cf9c91bc1cb6a535c496b339997209c969403059d282a85edfa7c8f15e499e0b72bf2d21018c45ade142dd680b23da4298af652ce7d34
 MISC metadata.xml 508 BLAKE2B a44f0a85d8f456b9a428dd9c38d3359c681ba6b327f5c612549f9fafd7bce14671c0bbe8b8cd518a1c6c13f310a356a77b5578c3413282b7f8381f9a3802548a SHA512 c37de00993e2555dac8973c7a334c26dd756d03abc555e39482a25880983a1babdcc8733d83c80498bab9b1940a5695da4b9f50d8de2c513dd720c70b79b6b2c
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
index 8b908430c3c8..dc74d5a2132e 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index 95944c164d5b..fc75ee2c9cbb 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1,4 +1,7 @@
 AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb6716114bd6cc1b78a5b94f99ea72400f9e9c776eaed60c5dc0593b32857e73aa27883e971b570e7b561cad4b85db1d706194b1 SHA512 a3459c78d55561ae703977e147965b04aa854eff1035c273a703936e6f069d5d501c91cf1db746d0ef93dbfe61c3d28b5d35be34a4982fcbe9f0c42d9204b1bf
+AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
-EBUILD r8125-9.008.00.ebuild 1339 BLAKE2B f2c89508a6f3342eb2a55dca67a43e08da455a9d816ca70ea61dfe557c60676ed74423d5da8b1ab2e417da4ccefe42467d6a807f21a06b296e5f16177b68be9d SHA512 2933786074e2524225d3ecbb641e48b51bf593cbeef76ef18c26e6a74be004b67a8de77f81abbe0016d151239716e697c9783a709eca901b1d7e377491e38527
+DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
+EBUILD r8125-9.008.00.ebuild 1399 BLAKE2B 59bb8848b09ee1ca476abbfbb156ded1e7cb3961aa287359aff792be2bd0b96b19d74a923ff545c3f6a53427c8536f190ee50d7ba837d5665e1d1e182f677b5c SHA512 45950f83abd6ac72475b58969c3c665eb7aa9fa31e7c6b4ec7aa356e06c58a5c5acc6287c23663a1b24902c8257907c6bb7c333df5370f4fbbc37d36d7a112ac
+EBUILD r8125-9.009.01.ebuild 1185 BLAKE2B b50ff489d98dd5fdf4fa8439c2414a47c71dab9782e3cc0eb052ef833bce84b34ed73dfae16abaaf24fbcaa6b4e9e6e3d4a60653092874c64169e861b80ceae4 SHA512 856ce45440f4e1d47c910588d5f88f85506dcffb01295e868c7033b85289f00fa6d9b2e7727f6c74cf33a7854640da06d4492c8b77cf141c9fb5da4c665b8b9a
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
new file mode 100644
index 000000000000..6da1bdae6b6a
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
@@ -0,0 +1,31 @@
+Added compatibility with Linux Kernel 5.18+.
+
+Author: Karlson2k (Evgeny Grin)
+Gentoo bug: https://bugs.gentoo.org/852311
+
+diff --git a/src/r8125_n.c b/src/r8125_n.c
+
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev,
+ 
+         if ((sizeof(dma_addr_t) > 4) &&
+             use_dac &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++#else  // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+                 dev->features |= NETIF_F_HIGHDMA;
+         } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++#else  // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+                 if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+                         if (netif_msg_probe(tp))
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index 7b0093e09b81..b848421ede7e 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -22,6 +22,7 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
+	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
 )
 
 CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01.ebuild
new file mode 100644
index 000000000000..2a1b7c235358
--- /dev/null
+++ b/net-misc/r8125/r8125-9.009.01.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+)
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 7764633b1c4f..6b2e3d8f0bb7 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,9 @@
 AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900
+AUX r8168-8.050.02-5.18-fix.patch 2340 BLAKE2B d85b0d826b58bad42999309d81bd2a7a5202f81dfe516d32c0a7857d63394c70e5e9f66dcdfa03f8f05dce525204a225c6fa1c73dbd6a0cc2dae7a3995be120f SHA512 952660cd26f2c14e21b45bb0fa88012f980f7999b1f33849a295bc757063f25c2b5911f155305d4cc0d671b503acfc315901d584a83c78c47aeb76ee8301f3d7
 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 DIST r8168-8.050.00.tar.bz2 115418 BLAKE2B b3e24d0548494f1904b5d3341994bdda35a05a71dce85a64c9e87cbde7f40807b0b1bcd78401928ff7625e67606918d5c844e8254cbbab62ed3f8e8058a3f15b SHA512 04043fd01ea877ea9f422b8f2319630b8664a49b41363039fc725ed382dc5afb732dda59ba63021a94c50b12ed2f0b3585cd668d969bc06fdc40d08420dbdb95
+DIST r8168-8.050.02.tar.bz2 115331 BLAKE2B 37690019e6b8642929e167df426e1a5e3c4d805ab812541018fa950084061ad971648b867dc5723e611c43fecb0f04d5915bb8199006ac50640aef5a9c2eb41c SHA512 54d7080b598933c7d24ca513019c6c971f7472320d474ab4ed4148d859886f942e52896d0b98046a780319f708847596e6bc081a88a9c11e075593c97eb831b2
 EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5
 EBUILD r8168-8.050.00.ebuild 1062 BLAKE2B 9f53614cb2b380f9a325ecc36a9ca4320a92011307cc85ac749227729f5286028e92adc10d821d1eb3e5d1f0bd791518d85690a894b22853eca1d5acccf0f412 SHA512 843fa593eba960ca5a81d30354bcaf4452db990a12e45d5d740d363393f8e23d8097492b008ddb9ddc2942945e82eb367bfa66b8df9755ee1875c5715d42cf16
+EBUILD r8168-8.050.02.ebuild 1120 BLAKE2B 2d0b7f3467ab274f154b4b77e9f872500bbc83ba00006f5bfb32fedacbe411d47fc635126f81c54e2b974de733880165f3b3103022b008acfaba8802ebe333da SHA512 915fca0ed33262f09c490bf231c7c45a39a0163cc22b4148acf58269820c9ec8e888b3892889e357ffb519a50cf1b8ab5da70171d3c73039e00ea4110b391ec0
 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
diff --git a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
new file mode 100644
index 000000000000..442fa1c3eadf
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
@@ -0,0 +1,51 @@
+Functions like 'pci_dma_sync_single_for_device', 'pci_set_dma_mask', and 'pci_set_consistent_dma_mask'
+no longer exist in 5.18.0.
+Fix similar to https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2238850.html
+
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -3698,7 +3698,11 @@
+         txd->opts2 = 0;
+         while (1) {
+                 memset(tmpAddr, pattern++, len - 14);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                 pci_dma_sync_single_for_device(tp->pci_dev,
++#else
++                dma_sync_single_for_device(&tp->pci_dev->dev,
++#endif
+                                                le64_to_cpu(mapping),
+                                                len, DMA_TO_DEVICE);
+                 txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
+@@ -3726,7 +3730,11 @@
+                 if (rx_len == len) {
+                         dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+                         i = memcmp(skb->data, rx_skb->data, rx_len);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                         pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++#else
++                        dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++#endif
+                         if (i == 0) {
+ //              dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
+                                 break;
+@@ -26408,11 +26416,20 @@
+ 
+         if ((sizeof(dma_addr_t) > 4) &&
+             use_dac &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++#else
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif
+                 dev->features |= NETIF_F_HIGHDMA;
+         } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++#else
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif
+                 if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+                         if (netif_msg_probe(tp))
diff --git a/net-misc/r8168/r8168-8.050.02.ebuild b/net-misc/r8168/r8168-8.050.02.ebuild
new file mode 100644
index 000000000000..33393afdbf6a
--- /dev/null
+++ b/net-misc/r8168/r8168-8.050.02.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.17" from above link,
+# we need to mirror it to avoid users from needing to fill a captcha to
+# download
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="use-firmware"
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+PATCHES=(
+	"${FILESDIR}/r8168-8.050.02-5.18-fix.patch"
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 8a19152fc52f..bcdc88539bba 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -2,5 +2,9 @@ AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e5856
 AUX rabbitmq-server.init-r4 652 BLAKE2B 4366ea0da306ac5a23bdf6803d81216fd39b1446ccc3d6b12a052e36f05e9fb152da368cffc63d0854cf1bfb2ca8e27f70c8ced0ddfda1954d63b21dc3fb0582 SHA512 a30b632474dca6b34ca9931a358e365c5fe0c25015c4baa0be1dcbea8dd4eaba35a5eeb4c25fcdbb3fdb573dea5d3435ab3672559ecd7619a2bfe1dcc1392693
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
 DIST rabbitmq-server-3.8.19.tar.xz 3263712 BLAKE2B 3dc990d3720883fe2b6b61d48122b64c81564124f48f0a0e6aa2dc1d0837f6dce0bf174b4044c39dc0c8da64b2f78499922c58c90d7e7f80e50b80b4535f55c7 SHA512 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea
-EBUILD rabbitmq-server-3.8.19-r1.ebuild 2098 BLAKE2B 012958ff734a8efa975274ea6ef7cbe615d4285d60b802b3c1ba2f1019868e443f1f157cf6b40ff0b159dfe66f7167ff774886d2d2419d13121b6f2a71183e94 SHA512 1720f0317e808a45a915fa6a543ca821d215b4cc6f68e624c4e85c095bcf057a53489b035a0250109e820322f26a6fd51c341f34b4487d6c5758dfc8b3e0efef
+DIST rabbitmq-server-3.8.34.tar.xz 3415500 BLAKE2B 90cf0ec285e53fd8ec7663857c036d9f202769840c1ae7ae0442fcbdc2cf32cdaf29a2ebbc6b50d2e73ba42f5ed407ea66443e1b39e92ae97f1dec66e9c706ab SHA512 3d30e81de8e6293d2784909109bdcc9c09c0f1e385da9c8570f844ab8dd0ac999631cff198c2f70c9345097759f87c4c7926dfb0c92c2a81a3753a2d740e9635
+DIST rabbitmq-server-3.9.20.tar.xz 3540364 BLAKE2B c430b08b5ecab1e6015a6d2ef2ac653ce111043bf41c8d80743c36273266b65d10c819e251fbc91a2d65276eea837b75d8d0ad01c61c3332b05b7e42843f34e8 SHA512 20205551e077545cdee6b64b28beebae0d9da32658ac1aea2548238bfdbeaf7b067ae28ce849e0458d611d8905219dfde17f2c46b229d27d7231ab6442936ec4
+EBUILD rabbitmq-server-3.8.19-r1.ebuild 2203 BLAKE2B 32e073bf325c44499f3a6a579ba33be15a091d7b985413cb5ffb83b3a879db48617070edb409daf0471dedd3b7fa2d38fda4bc5128c8e9ea5edeab12a226c530 SHA512 c80c56dc7f48d90e004f882300fa0ce15cc9241078d900bd037acf2ba7488dce79a89ab55644618fd38092ef4819929392987b8adb58bb503e1fa2631e60f0c6
+EBUILD rabbitmq-server-3.8.34.ebuild 2207 BLAKE2B bdfe97d395ccc15236291efd2aa9c747bda3c6e70eeb428dbfdc3a339143b6919a67d40839950a3ec27bd7d5b9290e10efa5b1833d92117405b8f6bfb9c46328 SHA512 0648a332130a26336e3926c7c5f8d3f6050c6d94deb70c905b11e0a5f5219b285487531723ec9db62cd5ff2d301110cc9085b9e4323edbee9b68b17bca0d8284
+EBUILD rabbitmq-server-3.9.20.ebuild 2207 BLAKE2B bdfe97d395ccc15236291efd2aa9c747bda3c6e70eeb428dbfdc3a339143b6919a67d40839950a3ec27bd7d5b9290e10efa5b1833d92117405b8f6bfb9c46328 SHA512 0648a332130a26336e3926c7c5f8d3f6050c6d94deb70c905b11e0a5f5219b285487531723ec9db62cd5ff2d301110cc9085b9e4323edbee9b68b17bca0d8284
 MISC metadata.xml 244 BLAKE2B 7a5cfcea42b430285e098019ccdf99eccf96c5ba82feeb5354a023aeb0c197c9e7c138b8329bc20a0080cc028c546a0fc52b74c383a64645aef2eea22b894522 SHA512 04757d267b2495bcc0f50cd5354a9bf2f5093ca396744f4cbcdb4eed249e94333226c52e346261ba8da975d3d5fc7bde3c50a5627875a15247b338bb1eddc2e7
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
index 2410ca43590f..85dfa8ae0db8 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,18 +20,22 @@ RESTRICT="test"
 RDEPEND="
 	acct-group/rabbitmq
 	acct-user/rabbitmq
-	>=dev-lang/erlang-22[ssl]
+	>=dev-lang/erlang-22[ssl] <dev-lang/erlang-25.0
 "
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
-	>=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0
+	>=dev-lang/elixir-1.10.4 <dev-lang/elixir-1.13.0
 	dev-libs/libxslt
 	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
new file mode 100644
index 000000000000..afe6892d7d5f
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit python-any-r1 systemd
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	acct-group/rabbitmq
+	acct-user/rabbitmq
+	>=dev-lang/erlang-23.2[ssl] <dev-lang/erlang-25.0
+"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.10.4 <dev-lang/elixir-1.14.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq/mnesia
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
new file mode 100644
index 000000000000..afe6892d7d5f
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit python-any-r1 systemd
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	acct-group/rabbitmq
+	acct-user/rabbitmq
+	>=dev-lang/erlang-23.2[ssl] <dev-lang/erlang-25.0
+"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.10.4 <dev-lang/elixir-1.14.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq/mnesia
+}
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 776b3ad8712c..e7bb7b8336fa 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -7,5 +7,5 @@ DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce
 DIST rdate-1.11.tar.gz 20210 BLAKE2B 0ff4abebe08f33b45c753dd2912c36e3895c1745b2d78340c7574116f50cd4d05364c5bee97e883b7ad587fcd5261931d928689cd583aa86b43aac408d2a4a6d SHA512 916952c26cdd51c8666bf62cdd823cf8a07fd4487fbf73213d529525b31a90f056120ea2ff16e6d37ea7c662853ba3c15789fef90724b2dbf17c21a6ff3f415d
 EBUILD rdate-1.10.2.ebuild 857 BLAKE2B 8970e5d2d8a0e6b77addb0b09d25ac975a8c10e34e1615a6780eae75d2fa1761434b81810c3c9524c3c78df854852548925457e7d713e935d03877266b4b58cd SHA512 a0fc238d98e0217ff2a79faf32570d1018dbe3e2c3339e3da8f5151dc55ffa4619f9e3bc295f5dddbf0f8a4dbfe768118d092344e0afc2cde6e3a072c1e6968d
 EBUILD rdate-1.10.ebuild 743 BLAKE2B a3241a2734fbde24280b2a78cbd91b11151d7536504ef01229dca386198c524f417b7c4714e1788a77ffe77515fcbf2b9c92cdb3d0523d1f899fc20a866a29ae SHA512 582511eb5b1c66b6575a4cf7f2e8a9663013a612f25943213d392e418e1f3b8b0786cb8ce45446b84250c3336c0838e72b6a220b2ba78ed7a687c89b4655b480
-EBUILD rdate-1.11.ebuild 750 BLAKE2B 16b8d6cb39bca95bcbfccee9829504ed20dbb512fd533ecdc5e72bdf56c9a2f161a74d5ab08e869d5a4bb93c215c5d9a30bf2aee347662734d5c492fe9c26c9a SHA512 9512a4afe11a5c40c0388f2df68e90ab40315f452ee673d3eb8e600c34457aa44a0710fe33de824cf8cbb46c2028b9b6cab06cae4323aaa349186f9feba7ece5
+EBUILD rdate-1.11.ebuild 764 BLAKE2B 82c6407b5e4ff389857f66b33792e639dd20edb9084d9225dae9c8c4b8f59b45ba0ff8ad0914024d50c6605d7bcbf484ab6d807b89789c833fff06c5f542b3ca SHA512 ab3fa9c687842fd1954fdc1f34da576e8686ac83e308473386fa2543715b8609836282167be95c0887d46e46ffa4b2b9850ec75bfb470419dbb876cf478d0c61
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/rdate/rdate-1.11.ebuild b/net-misc/rdate/rdate-1.11.ebuild
index dd88c82ec3e6..29e33f3c2cd9 100644
--- a/net-misc/rdate/rdate-1.11.ebuild
+++ b/net-misc/rdate/rdate-1.11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-${PV}"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="dev-libs/libbsd"
 RDEPEND="${DEPEND}"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 0bba6866b818..f103b42516e3 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,6 +4,6 @@ AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f
 AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 EBUILD rdesktop-1.9.0-r1.ebuild 1749 BLAKE2B 23e0faddcc839ce9ef8bbade80f66a642d2804cbdc12eca2b70cd41700ce6248b5e5d6490b1616e92b0fd1d0a2d895117b8136abc5f3bf8fbe7c7fc73db6bf1e SHA512 39fb5a3187dfa26161da186b26821c2c6d33fb9b242056a706cfa920b41a01307f799043d14478e6e723f6ecae350201e7adf2ab2bee088de6dea89b576c1b01
-EBUILD rdesktop-1.9.0-r2.ebuild 1788 BLAKE2B ec12da46b590b92ba54db4c475e8b7c0e46d9d714aea353636de859ec6f868cee495d9875b493b2eabeec7f4e34802d82701a4925e490e3e58572f66ecdd3fcb SHA512 87d3b47cdc4378b7dda51a17d9c750c89cb6699570c3d5c503c3c0722f3f06e2d400fbfcbbc2423d985e58a0aed89dd4e96c5aeb60d67e87b034ec8d0ded5e8d
+EBUILD rdesktop-1.9.0-r2.ebuild 1795 BLAKE2B 0b27ac660fb99ea8417d3daf3ab4788c82b4b6bd7a1767b137130ba39449f7f2eefd57fd30450c64f4458467fa0eb04c2ddec5b7ceac2a6cce153cd2e384d6ff SHA512 6c258cdcd7d14da85449aa1c40dd29acab05359456cd6e861164b9f3d40f1dc60a4de2c8d6ebf12add9f5c42ee787b47e15a1bd741692bae5ddaf24ca0abd812
 EBUILD rdesktop-1.9.0.ebuild 1694 BLAKE2B 643d0eb4f1aa7d86ebed2fea56d07c7d17f6610c4b6adaa2b3c502c0bc1821e2bb95b4b07f27f09e2b4592beadd29f6ffcf9d788a5a64b4deaec0888748dbe29 SHA512 7922b7ffc4cf08ba3c96faa43dfba382e573abfec39ab61d0bccbd63fed6b130fd536eec0bbe18996c519cf6a13935c8ced073632d62275c1829444aa4b2a84c
 MISC metadata.xml 884 BLAKE2B 175e0ddd380e3859b0cdc13f443187549181d966d19a1c6259d5f41fa23ed05b1c991806b6c5d7970763e90f8cfa4851e99282f3e3a23c5448ab921d7bc56cd7 SHA512 7e06750601ec13b823abac83b9794ebe2f0b48a0f5ecdb5adccc0db1b295f7804d545719b9372b0c38dc8df986c8886f108127488b32e2c600e2c36df5fa201e
diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
index 1f5e5559a2bc..4d21768aeb01 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index f1f3819901dc..b5f6662c1a9a 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,8 @@
-DIST Remmina-v1.4.23.tar.gz 3280050 BLAKE2B b62789dba4a4f0a0a12f4cc1da68431b0c386b618f3bf7babe8946cba3753bdfd8799731a254c18cf58e8a43efe6980d638adc9512303dfb229c5b340d957402 SHA512 151baead9c8e8051f6da2139691aa5644ccdd5752e1dd1be572b72fab01773caf261bfe44ebebc8524a36b447ee335275e6522bd2b6b65d4f0a790c92bd291d4
-DIST Remmina-v1.4.24.tar.gz 3375550 BLAKE2B 3ce777e3493c51915928ae63072c3df2123426563b514aa0cbde076084045e0e08c41fd363244db9dea247ca265486cad2184f7996cddcea941e983371d6af4e SHA512 39fecb82cedcd08720f800a69f778125811a141a152e88e8d657f082c5efcc4525483fb8374712db48743f9a0c2222e2312a9b3ecf5f043761d029edda86609d
 DIST Remmina-v1.4.25.tar.gz 3404247 BLAKE2B 59798362b33780041975f8af6c11b14a36876badeaed341f4600e9e920ec2b2ca78f33ddc69bb52608fc45488aefacf6c9ec9751369a4b5c23507519494180c4 SHA512 2409d316894a423de487c264861bda782bac365d13eb77f965863173072da85d228047ca0624bc7664cf6c1a5144598895371a56e37a1cc90df426d19b5719a8
-EBUILD remmina-1.4.23-r1.ebuild 2519 BLAKE2B bd58ce95fb25c3d3a4a01333d5cd8cda69ef42fd5c547dfc48fdb77bbac12322ab219dd6ec24838d43ad6f4a8170177dc1d3a04c995f7ef0995fe320f0173ee5 SHA512 fea16348e93f27044260d5d733c45729541ec49241ed5884d5a70e0c65632626d6228d172b0161b6d698d79c9c31c3eb570b42712101e3dfcfb6c40154349825
-EBUILD remmina-1.4.24.ebuild 2521 BLAKE2B c557f52a6b88878c01256463f6cdced00ecaea3a3d3e351a0378102db8e2ffeccf21ad99a38ade887c3628329c3d00fed729e78f1984652f082a2e0f98f7e291 SHA512 f8047454916cfa775041e2d26d53e0a40a70175722e828f48667961046b6999d171dc7cee2c5a30e5c5f6eaa269971c16182cf08e4ab918e1f4ef3520e573080
+DIST Remmina-v1.4.26.tar.gz 3451611 BLAKE2B 574510c7c2deed73887b4dec2b0b7036f5e4bfccb8c0229f9bcbca934896837a758d51e95965549643b44cedb66b57cdf9b7e5500790825951cc98d6846e8687 SHA512 fe81f3878017b82208255cc757d8897868cb810e44dd7d8dc88c8d371f96cec80936aaf86fd216568fba91401e13463bf3b278789b7c8839403f8c294cc049fc
+DIST Remmina-v1.4.27.tar.gz 3479987 BLAKE2B 96d4df06558a267db8605dc03de729061e303f9cebec84369ec3bdeeb19d4a377accaf224603ff9ba79bb9f1cecfa66519e6e02e328f42d24c46bdf3e1fabfa6 SHA512 2fff81a1a721b8ca87698697952bb1080cde6affc86c324f6fc30cc329ead57f0e617c39efeeee30890ad4812e719cee22a0b84df43aa1bc7db571607f208bfd
 EBUILD remmina-1.4.25.ebuild 2519 BLAKE2B bd58ce95fb25c3d3a4a01333d5cd8cda69ef42fd5c547dfc48fdb77bbac12322ab219dd6ec24838d43ad6f4a8170177dc1d3a04c995f7ef0995fe320f0173ee5 SHA512 fea16348e93f27044260d5d733c45729541ec49241ed5884d5a70e0c65632626d6228d172b0161b6d698d79c9c31c3eb570b42712101e3dfcfb6c40154349825
+EBUILD remmina-1.4.26-r1.ebuild 2760 BLAKE2B 28dc610b55a2282602c44d508ad57783b3e7c796932061ac5e4c36e0ae11152d2a1af2b85b926d4965c079cd27de53225eae13aaefacd5d84b2f1dc5a364e66f SHA512 c161cf72d1484daacb0ca60ce94e20872d3a615b6ea7c668628be74e4f6690915a0913e0d9eaa5c66c91c5f7363741f97bed3a7cf0d45094e303affa278100d5
+EBUILD remmina-1.4.26.ebuild 2521 BLAKE2B c557f52a6b88878c01256463f6cdced00ecaea3a3d3e351a0378102db8e2ffeccf21ad99a38ade887c3628329c3d00fed729e78f1984652f082a2e0f98f7e291 SHA512 f8047454916cfa775041e2d26d53e0a40a70175722e828f48667961046b6999d171dc7cee2c5a30e5c5f6eaa269971c16182cf08e4ab918e1f4ef3520e573080
+EBUILD remmina-1.4.27.ebuild 2741 BLAKE2B d6a40a7c6559b81de49b61f7d0ea36acf93f293b8a5c2e14e2f46b76cc55f86055ca425ff0039ae2b190835aa2169fa6db6d4ae4dc110cc9a9412e8ed247c289 SHA512 535f6c9f5d86527dfb166132efc511a56251b34b239b57bdb8ed3c20051e8e0eed74b8184b155a8e99faa43fc707589b74c3b692faf588db441d52f1e8dfc9ce
 MISC metadata.xml 1174 BLAKE2B 03a647f7a881a228a2123e269567394dcf5d8e908d223dcc30b87f11e7447ffbadcda0e4a29d9126b6d15c35ddb07a7a4b9b49631156d8efc2de3f460d202bf8 SHA512 fd1632f13bffe28ca6b2349dcd32641393c0fa9fe1dd6b629b2e6d8b88a3f7f1adce8f4dfe0adce7243e5fe485da9eeaf6042ea4f532e086c97cf5d21f34a91b
diff --git a/net-misc/remmina/remmina-1.4.23-r1.ebuild b/net-misc/remmina/remmina-1.4.26-r1.ebuild
index 9b772915c4d2..6f1f3ed73c2f 100644
--- a/net-misc/remmina/remmina-1.4.23-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.26-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake optfeature xdg
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake optfeature python-single-r1 xdg
 
 MY_P="${PN^}-v${PV}"
 
@@ -13,8 +15,10 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit x2go zeroconf"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	dev-libs/glib:2
@@ -32,6 +36,7 @@ COMMON_DEPEND="
 	gnome-keyring? ( app-crypt/libsecret )
 	gvnc? ( net-libs/gtk-vnc )
 	kwallet? ( kde-frameworks/kwallet )
+	python? ( ${PYTHON_DEPS} )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
 		<net-misc/freerdp-3[X]
 		cups? ( net-print/cups:= ) )
@@ -64,6 +69,10 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	xdg_environment_reset
 	cmake_src_prepare
@@ -85,6 +94,7 @@ src_configure() {
 		-DWITH_LIBSSH=$(usex ssh)
 		-DWITH_LIBVNCSERVER=$(usex vnc)
 		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_PYTHONLIBS=$(usex python ON OFF)
 		-DWITH_SPICE=$(usex spice)
 		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_UPDATE_DESKTOP_DB=OFF
diff --git a/net-misc/remmina/remmina-1.4.24.ebuild b/net-misc/remmina/remmina-1.4.26.ebuild
index 8e269e89a576..8e269e89a576 100644
--- a/net-misc/remmina/remmina-1.4.24.ebuild
+++ b/net-misc/remmina/remmina-1.4.26.ebuild
diff --git a/net-misc/remmina/remmina-1.4.27.ebuild b/net-misc/remmina/remmina-1.4.27.ebuild
new file mode 100644
index 000000000000..318b9a4f5ea2
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.27.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake optfeature python-single-r1 xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit x2go zeroconf"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	net-libs/libsoup:2.4
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet )
+	python? ( ${PYTHON_DEPS} )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	x2go? ( net-misc/pyhoca-cli )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	spice? ( app-emulation/spice-protocol )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_PYTHONLIBS=$(usex python ON OFF)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=$(usex x2go)
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 10290e00394f..3f080e26470f 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,16 +1,13 @@
-AUX rsync-3.2.3-cross.patch 4964 BLAKE2B 0f782eb6bf88e848d9ada93ac66dd4ca13c85ee9007e4e0509bca79f054e28915bed0dd78afeb3c3642ab284dbb54b3431abadc809328d0dfb0e78565c570812 SHA512 0d1c119b89be482e2348e265516452b29adde4eec40596af3e55bb309ce12702bfe7887cb3d8c86f59cfa6a24f71e113a9dd75d74353590c98ece11365636e0e
-AUX rsync-3.2.3-glibc-lchmod.patch 1836 BLAKE2B 14b2e4246c6c2d4623500e346bea3ad430defbb81de65ecb29672b390024e34e5116c660a87013f8d489a32d1841d535d03fa442cdc9e962d530355f389ad008 SHA512 76864a9002ef3e8c42a840906915de2bb8cfb1dea2597cbe657ee418b5d00b6d409a88cd441658f7a1ce3cab148a9889193ddd75d19b6ef2069379c728434231
-AUX rsync-3.2.3-verify-certificate.patch 944 BLAKE2B 2a6a088df102204e5c53f4eb1ca20f7ce54d46337044dd0e8a450013b7a1d59563ab43ee1c9e0edd947d8c64c79d0d8866fc1bdb1bd0d9f5209deef73a0532bc SHA512 bd0c3dabb3dc6a4b89d58970b4320639a0df7940d338dcbcc13a12f89e311ab549d246b14da2f6135cd9cfc807d7c9c82eb53a95c19fbe81e97dd48e090ed0c0
+AUX rsync-3.2.4-strlcpy.patch 1715 BLAKE2B 4159391589cc6eba7c6719b15d32d33e68ff5a15765b3377e1e53975c2d7c9413ac99e178d0e6a796d347aab4bf43b3f7a788a434ea36bc35adb916a39394ca4 SHA512 b097b253624fa67feb32f3cb6412fadbd731ec659791010310824ef0c83209a9d228706e84eca72614c0e3ce7a3ccbd4250dafad20dc2113b20d79135573fa9a
+AUX rsync-3.2.4-unsigned-char-checksum.patch 610 BLAKE2B eb6803c673bb38907738e5475e9469c07555d96769cc86baad43f806cd6a823c5aa9d890c63096b5c229402315cdd90d76d93687ddc1a7d17360ff739afc9596 SHA512 a8f8eb0568139893e2f3f36feb1cebfb5fcf3b1fd807459bce635d61f2582e960c55b0bb4c8914a6579ad0eb7e4322d2ce3480598d425e256fb6a73efbc9315e
 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
 AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
-DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-DIST rsync-3.2.3.tar.gz.asc 195 BLAKE2B cc18dd2589c09f869e35ecaf94a610e5b605dcb10ceaf01e6c0eb2667666a9a73feb7dcb2325638686c772f91a74d6d1f15ea33fdb6a38e89640f32a8cd0e04a SHA512 b7e512d8bb0aaff7c48571b918a7b0362942c65ef2a0aa076574ec86c05822dc5df41f8796fdf62b762b12d166a671c9e979f9962357b89e3649459c4567525b
 DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 SHA512 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
-EBUILD rsync-3.2.3-r5.ebuild 4019 BLAKE2B cfc6983ceae44e3fff86e43186fe0ffbfddac35843895586a593aa6aa97e398ccab12f696a36353a2a8e2509cd79a4795be4653c06c6bcd77872649166a4b0a2 SHA512 3f7462e646d7407e649a03c992faf10688b980cb4f42c36c6e7c1964abb0fbe64d76829f052130fe15cfcce2cc5a53e44422bc9ffcffc2cf72454e905c5cdc1f
-EBUILD rsync-3.2.4-r1.ebuild 4497 BLAKE2B 04a00f7ed3e40d2caafa9b0473d05b3635efae6823ca8df46a3a1c75d44a6528c41defa2e57041eaf95c0af3f7c39c2ee1265b8cf95338c1d1188c09e59f00c5 SHA512 b8d1c6ce1b18960c14964504d406445e2b0c03fc85fcaf2efbae9a611d2ba83288b18c3b0ebbf96e1e19829f579b9a3239039221e4fe78a550dfb54e8ee7e340
+EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
+EBUILD rsync-3.2.4-r3.ebuild 4774 BLAKE2B 627f0a8a6eefb65f60991216c182752e2d3f3950fb6d54a66ae3408fd06406cdd852918d55f602a5302726512edbe5b60c3d6dd7b60f767daf9c2688e573ce00 SHA512 06171efba0f3bd6eda0d1b3fb57341e861ec5bbef2d9c7b37223ba531ccef26c64f95dc33f872f746f8862bbf80ad8996c4616edcab28135c4b1d66a0875cf34
 EBUILD rsync-9999.ebuild 4490 BLAKE2B cf88182b642dea41913431c96f3fe67d5a254767cb65721139423702f53d613c6fa59d614ae6c0475314e5153525682e8bd6c154aaddba92c486c1ae00833592 SHA512 ca478bfa7cb1c50712816631c1d4cdbc4284eac6240306f10e8498956f1209f8dac94d7bc7f540bcfe21911fbafd5412fb42ea1d271756ef48ad5d799e9e05c0
 MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4
diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch
deleted file mode 100644
index c61090b7c40b..000000000000
--- a/net-misc/rsync/files/rsync-3.2.3-cross.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 9f9240b661c5f381831b62d72b6ea928a91ff43a Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Thu, 3 Sep 2020 10:07:36 -0700
-Subject: [PATCH] Set CXX_OK=no when cross compiling.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64d2e6d6..109546a6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -233,7 +233,7 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len)
- 	in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]);
-     }
- }
--]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no])
-+]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no])
- 	AC_LANG(C)
- 	if test x"$CXX_OK" = x"yes"; then
- 	    # AC_MSG_RESULT() is called below.
-From 7eb59a9152a2ace7bc7858e9915c671b3ab54344 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Tue, 22 Sep 2020 17:19:45 -0700
-Subject: [PATCH] Change from $build_cpu to $host_cpu as edo1 suggested.
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 109546a6..e8c06f42 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -211,7 +211,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'`
- 
- if test x"$enable_simd" != x"no"; then
-     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
--    if test x"$build_cpu" = x"x86_64"; then
-+    if test x"$host_cpu" = x"x86_64"; then
- 	AC_LANG(C++)
- 	AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
- #include <immintrin.h>
-@@ -283,8 +283,8 @@ AC_ARG_ENABLE(asm,
-     AS_HELP_STRING([--disable-asm],[disable ASM optimizations]))
- 
- if test x"$enable_asm" != x"no"; then
--    if test x"$build_cpu" = x"x86_64"; then
--	ASM="$build_cpu"
-+    if test x"$host_cpu" = x"x86_64"; then
-+	ASM="$host_cpu"
-     elif test x"$enable_asm" = x"yes"; then
-         AC_MSG_RESULT(unavailable)
-         AC_MSG_ERROR(The ASM optimizations are currently x86_64 only.
-From b7fab6f285ff0ff3816b109a8c3131b6ded0b484 Mon Sep 17 00:00:00 2001
-From: edo <edo.rus@gmail.com>
-Date: Wed, 7 Oct 2020 08:33:57 +0300
-Subject: [PATCH] Allow cross-compilation with SIMD (x86_84) (#104)
-
-Replace runtime SIMD check with a compile-only test in case of
-cross-compilation.
-
-You can still use '--enable-simd=no' to build x86_64 code without
-SIMD instructions.
----
- configure.ac | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3fd7e5d5..e469981b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -208,12 +208,7 @@ AC_ARG_ENABLE(simd,
- 
- # Clag is crashing with -g -O2, so we'll get rid of -g for now.
- CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'`
--
--if test x"$enable_simd" != x"no"; then
--    # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
--    if test x"$host_cpu" = x"x86_64"; then
--	AC_LANG(C++)
--	AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-+m4_define(SIMD_X86_64_TEST, [[#include <stdio.h>
- #include <immintrin.h>
- __attribute__ ((target("default"))) int test_ssse3(int x) { return x; }
- __attribute__ ((target("default"))) int test_sse2(int x) { return x; }
-@@ -233,7 +228,18 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len)
- 	in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]);
-     }
- }
--]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no])
-+]])
-+
-+if test x"$enable_simd" != x"no"; then
-+    # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
-+    if test x"$host_cpu" = x"x86_64"; then
-+	AC_LANG(C++)
-+	if test x"$host_cpu" = x"$build_cpu"; then
-+	    AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],
-+		[CXX_OK=yes],[CXX_OK=no])
-+	else
-+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST])],[CXX_OK=yes],[CXX_OK=no])
-+	fi
- 	AC_LANG(C)
- 	if test x"$CXX_OK" = x"yes"; then
- 	    # AC_MSG_RESULT() is called below.
-From 7d830ff52ff7b01f528f39aa27b1ab36ea8c1356 Mon Sep 17 00:00:00 2001
-From: Andrew Aladjev <aladjev.andrew@gmail.com>
-Date: Sun, 7 Nov 2021 22:45:49 +0300
-Subject: [PATCH] improved cross compilation detection (#252)
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fbdd17d8..9e7338cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -264,7 +264,7 @@ if test x"$enable_simd" != x"no"; then
-     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
-     if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then
- 	AC_LANG(C++)
--	if test x"$host_cpu" = x"$build_cpu"; then
-+	if test x"$host" = x"$build"; then
- 	    AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],
- 		[CXX_OK=yes],[CXX_OK=no])
- 	else
diff --git a/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch b/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch
deleted file mode 100644
index 970d7af42bad..000000000000
--- a/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9dd62525f3b98d692e031f22c02be8f775966503 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Sun, 29 Nov 2020 09:33:54 -0800
-Subject: [PATCH] Work around glibc's lchmod() issue a better way.
-
-diff --git a/syscall.c b/syscall.c
-index b9c3b4ef..11d10e4a 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -227,27 +227,35 @@ int do_open(const char *pathname, int flags, mode_t mode)
- #ifdef HAVE_CHMOD
- int do_chmod(const char *path, mode_t mode)
- {
-+	static int switch_step = 0;
- 	int code;
- 	if (dry_run) return 0;
- 	RETURN_ERROR_IF_RO_OR_LO;
-+	switch (switch_step) {
- #ifdef HAVE_LCHMOD
--	code = lchmod(path, mode & CHMOD_BITS);
--#else
--	if (S_ISLNK(mode)) {
-+#include "case_N.h"
-+		if ((code = lchmod(path, mode & CHMOD_BITS)) == 0 || errno != ENOTSUP)
-+			break;
-+		switch_step++;
-+#endif
-+
-+#include "case_N.h"
-+		if (S_ISLNK(mode)) {
- # if defined HAVE_SETATTRLIST
--		struct attrlist attrList;
--		uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
-+			struct attrlist attrList;
-+			uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
- 
--		memset(&attrList, 0, sizeof attrList);
--		attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
--		attrList.commonattr = ATTR_CMN_ACCESSMASK;
--		code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
-+			memset(&attrList, 0, sizeof attrList);
-+			attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
-+			attrList.commonattr = ATTR_CMN_ACCESSMASK;
-+			code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
- # else
--		code = 1;
-+			code = 1;
- # endif
--	} else
--		code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
--#endif /* !HAVE_LCHMOD */
-+		} else
-+			code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
-+		break;
-+	}
- 	if (code != 0 && (preserve_perms || preserve_executability))
- 		return code;
- 	return 0;
diff --git a/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch b/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch
deleted file mode 100644
index 9b462a1df721..000000000000
--- a/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c3f7414c450faaf6a8281cc4a4403529aeb7d859 Mon Sep 17 00:00:00 2001
-From: Matt McCutchen <matt@mattmccutchen.net>
-Date: Wed, 26 Aug 2020 12:16:08 -0400
-Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using
- openssl.
-
----
- rsync-ssl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rsync-ssl b/rsync-ssl
-index 8101975a..46701af1 100755
---- a/rsync-ssl
-+++ b/rsync-ssl
-@@ -129,7 +129,7 @@ function rsync_ssl_helper {
-     fi
- 
-     if [[ $RSYNC_SSL_TYPE == openssl ]]; then
--	exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port
-+	exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port
-     elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then
- 	exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port
-     else
--- 
-2.25.1
-
diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch
new file mode 100644
index 000000000000..d5a02f0e3159
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch
@@ -0,0 +1,46 @@
+https://github.com/WayneD/rsync/issues/324
+https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b
+
+From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayne@opencoder.net>
+Date: Sun, 19 Jun 2022 10:02:51 -0700
+Subject: [PATCH] Include bsd/strings.h if it exists
+
+Some systems apparently put strlcpy() into a separate bsd/strings.h file
+without putting the function into a separate library. Thus, configure
+finds that the function exists for linking but the build does not have
+the declaration (which rsync only supplies if it is also supplying its
+own version of the function).
+---
+ configure.ac | 3 ++-
+ rsync.h      | 3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 37dbb18a..37241637 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
+     netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \
+     sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
+     popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \
+-    zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h)
++    zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \
++    bsd/string.h)
+ AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include <netinet/in.h>]])
+ AC_HEADER_MAJOR_FIXED
+ 
+diff --git a/rsync.h b/rsync.h
+index e5aacd25..1cc037c5 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -338,6 +338,9 @@ enum delret {
+ # endif
+ # include <string.h>
+ #endif
++#ifdef HAVE_BSD_STRING_H
++# include <bsd/string.h>
++#endif
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
diff --git a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch
new file mode 100644
index 000000000000..18e56c31ce2a
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch
@@ -0,0 +1,12 @@
+https://lists.samba.org/archive/rsync-announce/2022/000111.html
+--- a/configure.ac
++++ b/configure.ac
+@@ -1117,7 +1117,7 @@ else
+ fi
+ 
+ AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
+ if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
+     AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
+ fi
diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild
index a5cde37a6997..d569ca909ecd 100644
--- a/net-misc/rsync/rsync-3.2.4-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild
index 4e060aaa03bc..d4fb6dbdd9a5 100644
--- a/net-misc/rsync/rsync-3.2.3-r5.ebuild
+++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild
@@ -3,29 +3,49 @@
 
 EAPI=7
 
-if [[ ${PV} != 3.2.3 ]]; then
-	# Make sure we revert the autotools hackery applied in 3.2.3.
+if [[ ${PV} != 3.2.4 ]]; then
+	# Make sure we revert the autotools hackery applied in 3.2.4.
 	die "Please use rsync-9999.ebuild as a basis for version bumps"
 fi
 
 WANT_LIBTOOL=none
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
 
-inherit autotools flag-o-matic prefix systemd verify-sig
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools flag-o-matic prefix python-single-r1 systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
 HOMEPAGE="https://rsync.samba.org/"
-SRC_DIR="src"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-	verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-S="${WORKDIR}/${P/_/}"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+	inherit autotools git-r3
+
+	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
+	inherit verify-sig
+
+	if [[ ${PV} == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+	S="${WORKDIR}"/${P/_/}
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="acl? ( virtual/acl )
+	examples? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+	)
 	lz4? ( app-arch/lz4 )
 	ssl? ( dev-libs/openssl:0= )
 	system-zlib? ( sys-libs/zlib )
@@ -35,18 +55,36 @@ RDEPEND="acl? ( virtual/acl )
 	>=dev-libs/popt-1.5
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+BDEPEND="examples? ( ${PYTHON_DEPS} )"
+
+if [[ ${PV} == *9999 ]] ; then
+	BDEPEND+=" ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unsigned-char-checksum.patch
+	# https://github.com/WayneD/rsync/issues/324
+	"${FILESDIR}"/${P}-strlcpy.patch
+)
+
+pkg_setup() {
+	# - USE=examples needs Python itself at runtime, but nothing else
+	# - 9999 needs commonmark at build time
+	if [[ ${PV} == *9999 ]] || use examples ; then
+		python-single-r1_pkg_setup
+	fi
+}
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-glibc-lchmod.patch"
-		"${FILESDIR}/${P}-cross.patch"
-		# Fix for (CVE-2020-14387) - net-misc/rsync: improper TLS validation in rsync-ssl script
-		"${FILESDIR}/${P}-verify-certificate.patch"
-	)
 	default
+
 	eautoconf -o configure.sh
-	touch config.h.in || die
+	eautoheader && touch config.h.in
 }
 
 src_configure() {
@@ -95,14 +133,17 @@ src_install() {
 
 	# Install the useful contrib scripts
 	if use examples ; then
+		python_fix_shebang support/
+
 		exeinto /usr/share/rsync
 		doexe support/*
+
 		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
 	fi
 
 	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
 
-	systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service"
+	systemd_newunit packaging/systemd/rsync.service rsyncd.service
 }
 
 pkg_postinst() {
@@ -112,12 +153,14 @@ pkg_postinst() {
 		ewarn "is a security risk which you should fix.  Please check your"
 		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
 	fi
+
 	if use stunnel ; then
 		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
 		einfo
 		einfo "You maybe have to update the certificates configured in"
 		einfo "${EROOT}/etc/stunnel/rsync.conf"
 	fi
+
 	if use system-zlib ; then
 		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
 		ewarn "using the --compress option."
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 675352780a3d..560219cb5de7 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,5 @@
 DIST rygel-0.40.3.tar.xz 1696424 BLAKE2B 90e3da7c4dcfe4b0789dc7cf64fb2b49f00d2892b18a2ea1bad1da4e2ac5c1684992177fcac9adb99785f0e5ec68ffa08ee3ba37a8694c47cb69a9e080e2f773 SHA512 b50613b49bfde656b587192b20b6aebd49bba176149e1adcc13b00f7a6bc525237fc74a2af5afe37704758df8d9446ddb01f1338472cc6626d30765df991f69d
+DIST rygel-0.40.4.tar.xz 1696492 BLAKE2B 9e22390b379b2e09abb2685b0c2a00bc03ae3668d4c6d5ed432dd9c5cefdf07a00370bc5a9a96bc542d14f48dfdcdf4db3647365833942d1d81dc377d0440705 SHA512 5e4003af9c0dc8a4b948cc63a12ec3f61c9e9f4f8007b196f9ce988c85e2fea7ec0a6c1e4217c59a770ca179b4ad8bba2e01aa99459a4e1179b9bc5db22ea0f8
 EBUILD rygel-0.40.3.ebuild 2194 BLAKE2B 858fc3d94a4c726820bfdbdc89f5275788938b10ec289d96dc80effeac1dd5df75b90ecbd921659325b71640e2af848dff3c8cadd1aa77242a55405cf7333b84 SHA512 cd6497f442f1b41a8a17790557c00269f2112ff64bb075bf3404cce6a60e029371936f879a87723c91a1b97a89edd25b845509ab87f6d508a680545b1ae8e6af
+EBUILD rygel-0.40.4.ebuild 2196 BLAKE2B 6665bf9c94b37248662ccc87f31327ceee86e89df6db4f51a86a1fa7b7862c502361ae2b7837f648c387f029b5cdb1afa7f6ed8b609e8163ff3866a86e2b240f SHA512 eefbd8890849027e6d936ac246e2a6424f89fdbe0a7e7531b3e2658316f289a4bb1e5a82f078095d21cdab796dc1dd97b0a7abeb96e965706f68e1bf54e184e8
 MISC metadata.xml 432 BLAKE2B efa83d6c3c964e076185ee541b7b25c59a7f46dd53f96900cc9a9b617133b476ec21747f6b70392fb3903075032774252b1580d90e512c0123d2dfc779d7591e SHA512 b8cf12e9798b778551cdf099ab7a87aa606e6c68697db1b1eb37e673cd2368781c80c9cbc41c5b492997ad4b39eed9f68075f7c4be8ec21ad021470757b72d1b
diff --git a/net-misc/rygel/rygel-0.40.4.ebuild b/net-misc/rygel/rygel-0.40.4.ebuild
new file mode 100644
index 000000000000..1b055e904ed5
--- /dev/null
+++ b/net-misc/rygel/rygel-0.40.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.42"
+inherit gnome.org meson systemd vala xdg
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gstreamer-1.12:1.0
+	>=media-libs/gst-plugins-base-1.12:1.0
+	media-libs/gstreamer-editing-services:1.0
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=media-libs/libmediaart-0.7:2.0[vala]
+	media-plugins/gst-plugins-soup:1.0
+	>=net-libs/gssdp-1.1.0:0=[vala]
+	>=net-libs/gupnp-1.1.0:0=[vala]
+	>=net-libs/gupnp-av-0.12.8:=
+	>=net-libs/libsoup-2.44:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+		x11-libs/gdk-pixbuf:2
+	)
+	tracker? ( app-misc/tracker:3= )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	gtk? ( >=x11-libs/gtk+-3.22:3 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	$(vala_depend)
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# Maintainer only
+#   app-text/docbook-xsl-stylesheets
+#	>=dev-lang/vala-0.36
+#   dev-libs/libxslt
+
+src_prepare() {
+	vala_src_prepare
+	default
+	# Disable test triggering call to gst-plugins-scanner which causes
+	# sandbox issues when plugins such as clutter are installed
+	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
+	#	-i tests/rygel-playbin-renderer-test.c || die
+
+	#default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc api-docs)
+		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
+		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
+		-Dengines=gstreamer
+		-Dexamples=false
+		$(meson_use test tests)
+		-Dgstreamer=enabled
+		$(meson_feature gtk)
+		$(meson_feature introspection)
+	)
+	meson_src_configure
+}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 1bbb53c3e36f..a255d03e9419 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,5 +1,5 @@
-DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d
 DIST s6-networking-2.5.1.0.tar.gz 110443 BLAKE2B 489676bcb050d57482b0901742b53ce6cff00e25c1d8effc5c3d96d8e8ad0d32d42a62c15c73155d3b21fcfe6f310fc0f0c020bf945ac1a4b1c7fb9e9785adf4 SHA512 5d64420811d8d8a0034431dccda82b7ddd546f3b7c40ed02e05565c29c3ec14b75477306fea1a1e4aacc898e66e03718d7ac229b85be82d62bfe26c3ffc5fdf8
-EBUILD s6-networking-2.3.2.0.ebuild 1477 BLAKE2B 96d16dfe48d15634efc4a263166d313fda023ecadf16bb1ee699bb3c82da7f392b4e78e50433870a61532c39a30092e4bd0899e8791fea298382c0c0771c9a66 SHA512 f4801e7bd836a1813cf4c30c6cff479ecb1804a76a6f4149be5282643e53bd4ac9ae701c8981d1d30053ee22f9e983d8def1de2c5db8d8133a59fea7bd2c6a82
-EBUILD s6-networking-2.5.1.0.ebuild 1499 BLAKE2B 37e5180ff6def720c91084889bfa9611269ff101f1c35dc56e3be6a7b9c3021238918cd7f3c010787582a16d70a8c31717be662928a0ce6bce90b2a2f2d64800 SHA512 73cb9a9746d3e2e93a0a4d3cd8bb87c36aea727331878c64abb269df38a2b5562e1ece1ffe6a7a97e0a7bc6ef618ee842f2862f8fdf49264c0d783c24f183483
+DIST s6-networking-2.5.1.1.tar.gz 110431 BLAKE2B 67776a8aa6b02d20ed73c8b8d45e255677c3688973f9ee5f8dcc0de5cfd26146b7ccdc680b22a57e2523d8ab3c08d6e090252e376d09c1edd971a391632d83a0 SHA512 a9c1970cad5b3aeee447cce7c858e8bd88ee378fe456cc68d032f195373dabf658eacf55d9fa39ec635e893116296c1c614b89d97c5045b90dbe745a52e24021
+EBUILD s6-networking-2.5.1.0-r1.ebuild 1504 BLAKE2B 33adf1e83378e0328edc28361b2e883e3bfd83fdaec2e38f0cac0d85b498091fea3439904ccfbf4f551686ac3a49aaa86b9b3a8810bc71138b32c741c7a987de SHA512 b4f765272eaa5496c9fed6f709bee064d2ed73aa43492c818db6d04eafc8390c14c300e66ad528fc6db29b5cf1a5bf2b9a8126145655ed6e8b2cd939e241c6d3
+EBUILD s6-networking-2.5.1.1.ebuild 1223 BLAKE2B 8e7b85ba0fca7e3cfd07a7fcb6c22037d9bd51d51ba8499ea9b35c0877e784e99cfbbdb4443bba569cd29c5c26972b4407e3c043a61f394466ba1153d81e58fc SHA512 81518d26f3ed84744d48c07ec48306e8f050962c38fa89d9efd2fb11af594704ff627bb09e608e321da06431570466db3bc1741f73610bbdf2855abf706e88b8
 MISC metadata.xml 807 BLAKE2B 3b0c32efb3bde7b1694f42e3210878e74b3b79d553cfde13815e4a3dee276540c8444191fdab060f3639ef8414ecc06c1efb3621a67b24a41c1fb3be01343a07 SHA512 a38d2ba464e4e6fa7da69fc2006e6110fcd5ab6e65d41676c4d8fc5ee06c5c9b4dc333ef83d1b607cd13927eb2a88d868aee92cd184bbc64d572a30900250833
diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
deleted file mode 100644
index a0221c4ec4bf..000000000000
--- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?]
-	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
-	<sys-apps/s6-2.10.0.0:=[execline,static-libs?]
-	!static? (
-		<net-dns/s6-dns-2.3.4.0:=
-	)
-"
-DEPEND="${RDEPEND}
-	<net-dns/s6-dns-2.3.4.0[static-libs?]
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/s6-dns \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		--disable-ssl \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
index 47a1748d6605..47977f15efc7 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
@@ -17,16 +17,16 @@ IUSE="ssl static static-libs"
 REQUIRED_USE="static? ( static-libs )
 	ssl? ( !static !static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.0.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?]
+	=dev-libs/skalibs-2.11*:=[static-libs?]
+	>=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?]
 	ssl? ( dev-libs/libretls )
 	!static? (
 		>=net-dns/s6-dns-2.3.5.2:=
 	)
 "
 DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.5.2[static-libs?]
+	>=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
 "
 
 HTML_DOCS=( doc/. )
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
new file mode 100644
index 000000000000..9adaf81f7a5d
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="dev-lang/execline:=
+	>=dev-libs/skalibs-2.12.0.0:=
+	net-dns/s6-dns:=
+	sys-apps/s6:=[execline]
+	ssl? ( dev-libs/libretls )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/s6-dns
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable ssl ssl libtls)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 667eb5e88d29..22db9f5e41a4 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -3,6 +3,8 @@ AUX seafile-client-8.0.6-select-qt5.patch 1092 BLAKE2B 887ea09f0fd4c21c8b1ec6544
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
 DIST seafile-client-8.0.5.tar.gz 11701650 BLAKE2B c9c436f53cf7effa6c2e1cdbb09f5cffd53f7ef8fa6f6b12bb92c0d3c2e54b38858c95a3ab4c511d16774a973c8c2a7e66842825e9535d1332e8589dc201d22a SHA512 1f3eb643dce980a1aa0ff71e0ecca83b3db0848f9983bf7782adae6d181ddc28454a6cd75ebfcf439c17eb2008a5e0d4a684e5cee60fe7b83297e9fce1fcfec9
 DIST seafile-client-8.0.6.tar.gz 11702726 BLAKE2B bcba073b9ec17c33f653ae89e518f30f96ec8f9bdb780a9e06ae75d565c223c6b0505fd1ec9475b66bcd8d26f84846a99968fc006514d1eccb4a72b8600f0ae4 SHA512 fceb272fa521a7343609285ff5b299f66886b2ea53a1395178c3f05313e9439853422de65d20902669034c4edacdf32eb5674e16e64218b0444221c77cd4256c
+DIST seafile-client-8.0.7.tar.gz 11718265 BLAKE2B a48e259d809644cb1949f35e80459aa2267c9772438eb09ba894a795553368935c8b63c78fbabbea2202d3f23eb001836acce0975b086f66ec6d804405c5b534 SHA512 b4a6d5896f828e0e8ac4b202c5cc933e0ade4c373074e48e76e3b4ffe670faec0ef62bfcc72607891fb2c8b066fc448976285985077c48c6e3763619f35f4629
 EBUILD seafile-client-8.0.5.ebuild 1158 BLAKE2B b20b2d534d47cdac3942c810ca69a27424e1fab73ec13bd97e30aaba888dad1d56565fabebb3ef93f54459abacbf7c9662ebacb3454638e21bde6786498eb8a7 SHA512 128bdb60cf92a4405771b1fd1a1ae751357a91d527d2e82161bd0f538a8d1f3830ecb2312211730f291338622db4522886252243b95d1cd91ead5cb144038629
 EBUILD seafile-client-8.0.6.ebuild 1228 BLAKE2B 94ebabe541be053ae9f698dbb055b87bf4b5f2ecb7300a2c7806382e4c38511fad8f33dfe6e0e1a6390dee32bd5ff80a0c1f1e6711be8174c47503d4e8fb59b2 SHA512 132dc1c0b80d0d4ecef7c99685603f5fe3081ef895866334a377f94b0fff493839c68f30b00c221b4dc11e5f37e5a073a34b9ebb82983dfa80e469e9d25e71a7
+EBUILD seafile-client-8.0.7.ebuild 1228 BLAKE2B 49dce54e7b15d3240ee808ded76045771e10c812737ba2752ed3ba98232bbeb63499724eacbfcdff244f15d56aca84a1cca4e173a1b333d79e08a225ffc3466b SHA512 47a4c5c094ef4a1d28286b6d451e475744bf6fe66964217245bd2985994a2847191d7e9a9b8e25e7631c6b3e7baa69a1f2d5595101f8e29186eeb4e7abe0b421
 MISC metadata.xml 577 BLAKE2B 2370893b5c79210e63c40cd24532db7f376f57bce60728359b8645dc77717e4453fd9e2abf95d7c67882104a88c402585c0493c0a52ca0f84eceafb2928d338a SHA512 810d37c18e32318a1e9797186d2d1f3c74adfb6366fa8d9ffc966adc46779e352550d5e01ac73a9fd259d14fe0d931e37835f2ccf5f42648e3a6a40c3029ad10
diff --git a/net-misc/seafile-client/seafile-client-8.0.7.ebuild b/net-misc/seafile-client/seafile-client-8.0.7.ebuild
new file mode 100644
index 000000000000..ce469197b9f0
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-8.0.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream is moving tags repeatedly, then we use commit hash.
+RELEASE_COMMIT="8b96abf64e6aa19e3beeff6b322bcd6d28120bdd"
+
+inherit xdg cmake
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	sys-libs/zlib
+	virtual/opengl
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.6-select-qt5.patch"
+	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
+)
+
+S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 3f3f33a71606..3258745daf15 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,5 +1,7 @@
 DIST seafile-8.0.5.tar.gz 738268 BLAKE2B a142acd9613b4a4aba62640486ee3e79de13274f068e8db69693d93092123f73150e579a38e2aaffc0144cb03a88c56cdac20ca33c0c9a5d09bb8684f184e193 SHA512 712a5d445f586beb9cbd425298734181f2eef302dc2f1f7634c4182bd113a7818c948475e9981ce32af218fcc635254e4d5fea28d514ad6eafe169c4a41eb6f9
 DIST seafile-8.0.6.tar.gz 738248 BLAKE2B c36904c459429985bf5a6b34546be7af2ba913b4dc5df860858cf73c0d0fe4797fc1fd64a70d8feb3ac2888404e30705540672cdbcc7cea4b91e6229939ed1e4 SHA512 261e1c58018f3e427e79a811f67322a2d0ce4cc8bfa913f029bd42bdfa5498f35ec5003cafc8eaf583b0b0ef9cd7159bc4f57136f4fd4270b38327a79e0f95cd
+DIST seafile-8.0.7.tar.gz 738238 BLAKE2B edb6ab4f1e61455a24ed43c4b516b58f0cd44fd57f63ebb7aca6daaa206888689c9139fd443acfb2fb35ace100921470e207c338ae5bcdd093e02e79ab57ef80 SHA512 4ce16b2abed36ff33237df1119be7ecb3a01caa9d29c954a6618dfbc94d4ba32c0e30bcf259a6f05bf6bfe0e2aaca7d394c6b6adf69c37447e27a9ed5ac0d3df
 EBUILD seafile-8.0.5.ebuild 1329 BLAKE2B 2e45116d0305657f55567a5130d6eec63af5806664a94059b4b9774ddb1825485a4e61f8ae2df00459045a799043863c4fb05545b9b88e25ac64c1110636eecc SHA512 0bf8344e36cfe8cc08abc2af95c9dc92cfa9bd38a89a49ba49eefe0b0fd4330cd65d8fb373267df3d5dea984c1a830580f0425948cfd3c62e53f7c2f7ff24517
 EBUILD seafile-8.0.6.ebuild 1393 BLAKE2B bbd22916d81a92980398840f7a09288a0e4f915330bebf8f19ba74d7e1862b2b199f14720b59b111e38aadbe38d47e62aebd95286e0c4732bedddd904ce1ab4f SHA512 84634bb83f93f55b8d414820eb30c5897bc707515c916496648cc784a1bd86969a53f4cdbc994fafd7480cbeacf554d4dfb967df01e6f57a571ba3145beda13f
+EBUILD seafile-8.0.7.ebuild 1393 BLAKE2B 3d3d1600403a40e000697e27e29c7faa7bb598eae7634fafb12d1ad5beaf42aecda53e1e12aa120d9d9727adbcd25109f8e5880d574fda82fde1beb04b7c18e4 SHA512 58794479ee443bd2d3409f4676282ed9aeb4181b95ccc614160835f1850a87d060de222352d9d5b5bfb4fe3c38cd876842e6cd959358833581b770dc3f5db2c4
 MISC metadata.xml 478 BLAKE2B 2c1506537c1d19f3aa9f731cecf2f53181bdfb92c33d3100e8338e778e222b396ebfd5c7f5745e133583615ca61be625787792d39d3772cede50f8b923ab1a4f SHA512 20620dd548eec869bb219011b157d821cc3fd939602d2662c26e1148582c2a593375b36085fae939880e01d76a251e91f35b9ad657cbad0a1e27bdfdc46b932c
diff --git a/net-misc/seafile/seafile-8.0.7.ebuild b/net-misc/seafile/seafile-8.0.7.ebuild
new file mode 100644
index 000000000000..f1caa8837488
--- /dev/null
+++ b/net-misc/seafile/seafile-8.0.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Upstream is moving tags repeatedly, then we use commit hash.
+RELEASE_COMMIT="57c5ebab0efb596b398d206779fd3160101805eb"
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/future[${PYTHON_USEDEP}]
+	')
+	dev-libs/openssl:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	$(vala_depend)"
+
+S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"/usr/bin/seaf-cli
+}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 5a3d0d16d285..a6bd6f066160 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf
 DIST smb4k-3.1.2.tar.xz 3189176 BLAKE2B 5d34eca46015a939fe3c0c4e2c73882938e6e462e06d3138429c01f203d894be0625703c38767b0260ea8e349acf9b5ce739fda0daed2091527fc08d6a2fb84f SHA512 6871d831e4b4f1cf471e9b225eb0761549a3a754c82a219041c335f970965d7ffd897cac8becfca5e358e1664dc1afed31febe44531267c272e565d2039b3f4c
-EBUILD smb4k-3.1.1.ebuild 2042 BLAKE2B 9b4edaddb0f9ef9c333d6df926970f07d2fd02ee08d0e10e770535dace05b6c56324014eba8c0997224793cbabccfe0739b5d3688bb6c887016c6cfd7a3c9567 SHA512 4295a76709306a5d889f1bb223c5cf3dc0462e33dc41c884372fe441d4897d4c31c3ee37b9c0eb3f2556ae254a52fe695d261b9647954d321d596017ae2f4271
-EBUILD smb4k-3.1.2.ebuild 2042 BLAKE2B 9b4edaddb0f9ef9c333d6df926970f07d2fd02ee08d0e10e770535dace05b6c56324014eba8c0997224793cbabccfe0739b5d3688bb6c887016c6cfd7a3c9567 SHA512 4295a76709306a5d889f1bb223c5cf3dc0462e33dc41c884372fe441d4897d4c31c3ee37b9c0eb3f2556ae254a52fe695d261b9647954d321d596017ae2f4271
+EBUILD smb4k-3.1.2.ebuild 2049 BLAKE2B 9ab0f18feea03c8474b4a6c24ec8cf0d1adab6ceda8de0c816f6fffced71a8d4bb84c0ed407edf9dc62b0ea13b01f69243d2b10eb125089c81fe574361e1c2ad SHA512 e6cf5a1ca4a6db1c649703ede3468b7183382d1f34e986415e8e7d52bd48ad4fbeaaa335df8781579d4af89139822162a3d8989b3a05cc5b3111ab867fe63355
 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b
diff --git a/net-misc/smb4k/smb4k-3.1.1.ebuild b/net-misc/smb4k/smb4k-3.1.1.ebuild
deleted file mode 100644
index d3a8b0160e1b..000000000000
--- a/net-misc/smb4k/smb4k-3.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+discovery plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-	discovery? (
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
-	)
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
-		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.1.2.ebuild b/net-misc/smb4k/smb4k-3.1.2.ebuild
index d3a8b0160e1b..4b2b349c8161 100644
--- a/net-misc/smb4k/smb4k-3.1.2.ebuild
+++ b/net-misc/smb4k/smb4k-3.1.2.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index f5c4f3b8f241..2f507ad0ec9c 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -3,6 +3,6 @@ AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff
 AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24
 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b SHA512 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.4.3.ebuild 1839 BLAKE2B e3abbce79b31b5f8e3811e5f1d3a4a23778c4701a207828dcd82c9a63de90195e724e4802573e4104da86019b8dac71d197ecf9ff3244bcff1b972830d1e810a SHA512 d0c5e16414d25146f4aaf4a545aecf80666c813be9091ac24cb7be9e5347678bd778630d8dae70b8f79d7fd68a111f31d305e19d6d0545d4b75b515e0b14c9f1
+EBUILD socat-1.7.4.3.ebuild 1846 BLAKE2B 51b7d2f01afd4efec5338d1d38aa53dc287f8493424206b0d1a60ad86b0e250c209a82b61164a6b3d2768c5619d94b9b216ae8cec55541f3a276795d2f523201 SHA512 3958922ef28097cdca8ee392c1e45e7947603e6bbd3fa397055145f00fb94728b762c59fab722d7b25b33298f073d08f05bdc82f3634c6c2cc56c687fda3e320
 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.7.4.3.ebuild b/net-misc/socat/socat-1.7.4.3.ebuild
index 79675ef1a190..f60964294e44 100644
--- a/net-misc/socat/socat-1.7.4.3.ebuild
+++ b/net-misc/socat/socat-1.7.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 786d850bb4c0..e227d6b331e1 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45
 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
+DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
 EBUILD spice-gtk-0.39-r2.ebuild 3205 BLAKE2B 70c637fc3edd032462b4a5eef134d03e7f8b5805a96d0b3fa72fb1bae49aa2e49cd7db7b3c1f7399051a3a754aa96402cea83a5618313ca3e3fbefd8ee8a0e65 SHA512 6bc020c385e9ac49cb8f23d259c69d4c578377d9baa068885ac268ae4acb5c60dc4624bb1606aca0d14c8e31e49e3ff3a940716c2912eb867a0062630b1e0e4e
-EBUILD spice-gtk-9999.ebuild 3158 BLAKE2B c5a87f0de68702ad2ed030b4fd82fe7d945d9f468acf890744ed441ec3d5695ddfb80c01d0e8b26d12c5a723371b06e7f8c9440881989bc1c8c0271356917f5a SHA512 6bcd6a0cdceb6af987d9044b155236b46bb99fb2a7d0b2c5e607267004a41b092613bcf0a3177048d956c58f9a6ec11f7b92e81b5716923c910907729465c079
+EBUILD spice-gtk-0.40.ebuild 3668 BLAKE2B 7363180cd7de7fe721a557043a7858268abdbfea8e89e9c4528bcbac5820ee492cb43b198f771aaa9d410051bc3ae3a4f30e9b114f6a1bfd1d25f53b7c0db8eb SHA512 37501a0ac3359e2df1c815b2d58b88b9472e8ed5f0b9126bf5bd6f3e2f7f42f5cbe4bac5539cbe0c87aad43a12aebca54eac27f14775971e52ace1e0e69b4de1
+EBUILD spice-gtk-9999.ebuild 3668 BLAKE2B 7363180cd7de7fe721a557043a7858268abdbfea8e89e9c4528bcbac5820ee492cb43b198f771aaa9d410051bc3ae3a4f30e9b114f6a1bfd1d25f53b7c0db8eb SHA512 37501a0ac3359e2df1c815b2d58b88b9472e8ed5f0b9126bf5bd6f3e2f7f42f5cbe4bac5539cbe0c87aad43a12aebca54eac27f14775971e52ace1e0e69b4de1
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.40.ebuild b/net-misc/spice-gtk/spice-gtk-0.40.ebuild
new file mode 100644
index 000000000000..357e2deefa6d
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.40.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
+	inherit git-r3
+
+	SPICE_PROTOCOL_VER=9999
+else
+	SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+	SPICE_PROTOCOL_VER=0.14.3
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0[introspection?]
+	media-libs/opus
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	x11-libs/libX11
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	introspection? ( dev-libs/gobject-introspection )
+	dev-libs/openssl:=
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwdata
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+		)
+	)
+	webdav? (
+		net-libs/phodav:2.0
+		>=net-libs/libsoup-2.49.91:2.4
+	)
+"
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}"
+BDEPEND="
+	dev-perl/Text-CSV
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature lz4)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+		$(meson_feature wayland wayland-protocols)
+	)
+
+	if use usbredir; then
+		emesonargs+=(
+			-Dusb-acl-helper-dir=/usr/libexec
+			-Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use usbredir && use policykit; then
+		# bug #775554 (and bug #851657)
+		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
+		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	fi
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
+}
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 5d2a172d0ec3..357e2deefa6d 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -1,23 +1,32 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit desktop git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils
+inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
+	inherit git-r3
+
+	SPICE_PROTOCOL_VER=9999
+else
+	SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+	SPICE_PROTOCOL_VER=0.14.3
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
-KEYWORDS=""
-IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
@@ -29,17 +38,15 @@ RDEPEND="
 	media-libs/gst-plugins-good:1.0
 	media-libs/gstreamer:1.0[introspection?]
 	media-libs/opus
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib
-	virtual/jpeg:0=
 	>=x11-libs/cairo-1.2
 	>=x11-libs/pixman-0.17.7
+	x11-libs/libX11
 	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	introspection? ( dev-libs/gobject-introspection )
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	lz4? ( app-arch/lz4 )
-	pulseaudio? (
-		media-plugins/gst-plugins-pulse:1.0
-	)
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
@@ -53,7 +60,8 @@ RDEPEND="
 	)
 	webdav? (
 		net-libs/phodav:2.0
-		>=net-libs/libsoup-2.49.91:2.4 )
+		>=net-libs/libsoup-2.49.91:2.4
+	)
 "
 # TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
 # configure knob. The package is relatively lightweight so we just depend
@@ -65,16 +73,13 @@ RDEPEND="${RDEPEND}
 	x86? ( x11-libs/libva:= )
 "
 DEPEND="${RDEPEND}
-	~app-emulation/spice-protocol-9999
+	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}"
+BDEPEND="
 	dev-perl/Text-CSV
 	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
-"
-
-BDEPEND="
 	$(python_gen_any_dep '
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
@@ -82,14 +87,14 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
 	default
 
-	use vala && vala_src_prepare
+	use vala && vala_setup
 }
 
 src_configure() {
@@ -98,18 +103,20 @@ src_configure() {
 		$(meson_feature introspection)
 		$(meson_use mjpeg builtin-mjpeg)
 		$(meson_feature policykit polkit)
-		$(meson_feature pulseaudio pulse)
 		$(meson_feature lz4)
 		$(meson_feature sasl)
 		$(meson_feature smartcard)
 		$(meson_feature usbredir)
 		$(meson_feature vala vapi)
 		$(meson_feature webdav)
+		$(meson_feature wayland wayland-protocols)
 	)
 
 	if use usbredir; then
-		emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" )
-		emesonargs+=( -D "usb-ids-path=${EPREFIX}/usr/share/hwdata/usb.ids" )
+		emesonargs+=(
+			-Dusb-acl-helper-dir=/usr/libexec
+			-Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
+		)
 	fi
 
 	meson_src_configure
@@ -118,6 +125,18 @@ src_configure() {
 src_install() {
 	meson_src_install
 
+	if use usbredir && use policykit; then
+		# bug #775554 (and bug #851657)
+		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
+		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	fi
+
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
+}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 82b9d88817ef..c9a55b3b32f5 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,7 +1,9 @@
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
+DIST streamlink-4.1.0.tar.gz 447665 BLAKE2B 18577544c64266bbd013ad90f80b452d0ec8800ba6650acdf30da00997498d3b642873069f64f1445ddfcfdc91d4bd4b64a7f35895ac2685fb01735e7d4f4539 SHA512 f163766bffe079c10cb9f33792ca1e8fa806f46fac64716bada5221f97b6b7b6786f1a218a9ba0ba6ae4eb1b9e5bfc8bf2de1a6b2e5bf9d4c9ba8b11a6a99b9e
 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
 EBUILD streamlink-1.3.1-r1.ebuild 1978 BLAKE2B c2c51ddcc295b0be2d9cc75ac252f991e6d087666c3ebb3562f40fe66798d84edca9f47e38612b972690b112ec229023d2d81adac2a4c375444caf0c4e8d3497 SHA512 ed905fff46702949b7de43622dc69b72a660e97b42f818b479a3bb99f95d73ffc9b3e64fb10a39f681f894369c82da6100ca938dc283223c9d8aab9e28194e9e
 EBUILD streamlink-2.0.0.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
-EBUILD streamlink-9999.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
+EBUILD streamlink-4.1.0-r2.ebuild 1513 BLAKE2B 0198953b62784af54a7ed90dd0df1f49abca56d5a014916ec6d477c14cb37fc13e9b1d6fd5d8d1a848284626e53b598c34ccc837601449ba39b61cbc636fe4b7 SHA512 0731859b980472685e657adee6f8a581f733fe78a0fb37638233e26ec95bc84be6e6bcbb1c0c274063d4464c58a4ae6d206370501c1f541bcdaf48d1bbeeae68
+EBUILD streamlink-9999.ebuild 1508 BLAKE2B c5b55bdd15e64d53dd3879e497df337cfa6df0e296df045bf5a9004e0d1a4e7221a0ee888694fc00e13eb02aef443a8ae8288b69a6299a3147c9a37b070309f9 SHA512 1a489584690862d1177e0ac0b4aa792ae10db12e39781f0f26bd8b5966cdbf766fa80126dd2d5f5ab214c9fb42812e6ae402638575d00b24a40e2657d726ce68
 MISC metadata.xml 331 BLAKE2B 7872b2d59cd70d3f8fe1cad4d41d66a0e0fb5cac22412b7239273d0ab7fe028da8992b8d1113cb3bcb8d04a4486ff60155935bfd4dcb17b412ed4e2ea0db42a2 SHA512 4606169ce928cad0bddfde73fe826ba58c901756e8c23e46b998d1fcf317cad922f0816bb459188a2267fe242239fc330805a493a5a28ab43c58d61d97429a3c
diff --git a/net-misc/streamlink/streamlink-4.1.0-r2.ebuild b/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
new file mode 100644
index 000000000000..31e03af2cb69
--- /dev/null
+++ b/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/versioningit[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 92c0803d4cf5..1f654f0ef9f0 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -1,74 +1,58 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	GIT_ECLASS="git-r3"
+	inherit git-r3
 fi
 
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${GIT_ECLASS}
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
 
 DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
 HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	$(python_gen_cond_dep '
 		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
 		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
 		dev-python/websocket-client[${PYTHON_USEDEP}]
 		dev-python/pycountry[${PYTHON_USEDEP}]
 		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
-	media-video/rtmpdump
 	media-video/ffmpeg
 "
 BDEPEND="
 	$(python_gen_cond_dep '
+		dev-python/versioningit[${PYTHON_USEDEP}]
 		test? (
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/requests-mock[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
 			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
 		)
 	')"
 
-src_prepare() {
-	distutils-r1_src_prepare
-	if [[ ${PV} != 9999* ]]; then
-		mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die
-	fi
-}
+distutils_enable_tests pytest
 
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
 	export STREAMLINK_USE_PYCOUNTRY=1
 }
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if [[ ${PV} != 9999* ]]; then
-		doman "${WORKDIR}"/streamlink.1
-	fi
-}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index b0f8e28221f5..849226d31ad3 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,14 +1,8 @@
 AUX stunnel-r2 1652 BLAKE2B 7a1ee4d81b51583fcc2138b09999bd8ee66f03305f477ea6929eab43384a153f088c5703818aa99fe6f0cca40f177328ea916d64d410ec37bf68638e443aac90 SHA512 cd4bc2bd38df267cac979587e36cee878d60ce4a7b1c11ba72323b6955d30ce927bacd125b2a9ef329ca1c69d882af68abaae1412cd5c12f727178a8f466e6fc
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
-DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
-DIST stunnel-5.60.tar.gz 984278 BLAKE2B b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228 SHA512 4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
-DIST stunnel-5.61.tar.gz 873660 BLAKE2B 450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3 SHA512 e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc
-DIST stunnel-5.62.tar.gz 862456 BLAKE2B ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1 SHA512 4ce03faa27e417b49fbdf0fbac91befb2c05ce64694b4b6fd2fc482031ee4a229299627133a47ff3efdfdffce751e1300d95d0a8ac1f1858c7c96f0b067170de
-EBUILD stunnel-5.58.ebuild 2951 BLAKE2B afa7a612d238ba4e1195da562a63d632472cac4c11affbace964201206e7dfe472fd757ab548c0a2834e0b8cbaf4a1f44bd34d888a37a8dcabe04f57ef76cd88 SHA512 947e8b54f6d21b980bcc4afcd43a644da26ff8565fa6ad312c8086d2c782cd345a20fda94781296df4e8c913b5e0b88ddf582588a430bce4b9d4bbde05c3c651
+DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
 EBUILD stunnel-5.59.ebuild 2998 BLAKE2B c3421d1466ef1c50be9a0080b0fcabc4a0dc1d898fd3b9981adc7a80d5d6fe74c8cd883447f6fe2c46d89cf8e4fe1cb3b9ee6c920da652f705a3d55f5f1567ff SHA512 34491f45e231755ca5fed2a84c08b3e74d67ec125b12ee3ef3d111fe7e4df9966812052f402502b23935b514296c168d6bd4966bcde32edc5d25f6a02c63328e
-EBUILD stunnel-5.60.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
-EBUILD stunnel-5.61.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
-EBUILD stunnel-5.62.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
+EBUILD stunnel-5.64.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
 MISC metadata.xml 797 BLAKE2B 223460276faf20ee415c5c0137aefe26cfd54df0049cdfce1c62bef53aeef6c9f35967d05995b8a3a2e8958e427ae34dc3acb26aa7939d7b52f8996d324480f3 SHA512 a391483377cbdf230f6d41f9dfd88b76a2fb3219b868b4c090e6ba977482378599f1d087d884f88b31f2a76e2fccd37f72ee6a7cb39aaea5f4b6179c64e75fd6
diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.58.ebuild
deleted file mode 100644
index 256081a6b48b..000000000000
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ssl-cert systemd tmpfiles
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="https://www.stunnel.org/index.html"
-SRC_URI="
-	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="
-	dev-libs/openssl:0=
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-RDEPEND="
-	acct-user/stunnel
-	acct-group/stunnel
-	${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )
-	stunnel3? ( dev-lang/perl )
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable ipv6)
-		$(use_enable tcpd libwrap)
-		--with-ssl="${EPREFIX}"/usr
-		--disable-fips
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r2 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	tmpfiles_process stunnel.conf
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
-	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
-	einfo "your custom instance"
-}
diff --git a/net-misc/stunnel/stunnel-5.60.ebuild b/net-misc/stunnel/stunnel-5.60.ebuild
deleted file mode 100644
index 7f0616ce3608..000000000000
--- a/net-misc/stunnel/stunnel-5.60.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ssl-cert systemd tmpfiles
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="https://www.stunnel.org/index.html"
-SRC_URI="
-	https://www.stunnel.org/downloads/${P}.tar.gz
-	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="
-	dev-libs/openssl:0=
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-RDEPEND="
-	acct-user/stunnel
-	acct-group/stunnel
-	${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )
-	stunnel3? ( dev-lang/perl )
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable ipv6)
-		$(use_enable tcpd libwrap)
-		--with-ssl="${EPREFIX}"/usr
-		--disable-fips
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r2 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	tmpfiles_process stunnel.conf
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
-	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
-	einfo "your custom instance"
-}
diff --git a/net-misc/stunnel/stunnel-5.62.ebuild b/net-misc/stunnel/stunnel-5.62.ebuild
deleted file mode 100644
index e95ddd9a93dd..000000000000
--- a/net-misc/stunnel/stunnel-5.62.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ssl-cert systemd tmpfiles
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="https://www.stunnel.org/index.html"
-SRC_URI="
-	https://www.stunnel.org/downloads/${P}.tar.gz
-	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="
-	dev-libs/openssl:0=
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-RDEPEND="
-	acct-user/stunnel
-	acct-group/stunnel
-	${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )
-	stunnel3? ( dev-lang/perl )
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable ipv6)
-		$(use_enable tcpd libwrap)
-		--with-ssl="${EPREFIX}"/usr
-		--disable-fips
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r2 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	tmpfiles_process stunnel.conf
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
-	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
-	einfo "your custom instance"
-}
diff --git a/net-misc/stunnel/stunnel-5.61.ebuild b/net-misc/stunnel/stunnel-5.64.ebuild
index e95ddd9a93dd..e95ddd9a93dd 100644
--- a/net-misc/stunnel/stunnel-5.61.ebuild
+++ b/net-misc/stunnel/stunnel-5.64.ebuild
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index cdba1e0a37b7..db0c0662311b 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,3 +1,3 @@
-DIST sysrepo-2.1.42.tar.gz 712516 BLAKE2B 6ae56ada0156f49483ca9c3b2494a4bc8093ffa910a2f043e12f4cc5af2285580dfd0f950d5fccb2c00b5a299c9345045194b480ef857448479de5e838b49bbc SHA512 186eee0f1ddef28a1aa2d9a9038e9fcbfc829579f1a47eeefb4f2aa31d18f97ec2723bd04fe0684f80dacfba3d1a8da8748b564e310ffbdde5f18251c81d7405
-EBUILD sysrepo-2.1.42.ebuild 776 BLAKE2B b471c3dbcb63922783798bb9e56ba8e23492cb8c4656adfebabf42cc4167389b96d681f0ddfd72a296e83d081c7e66448b1520c74970c5ffbbdd1219791733e3 SHA512 fa25527f2efff4a73bf2d71bc04d2c70bce3b94e87f84570b6f4cffd477b38f54e019c4dfcce92fe7b0f4589f74b3ebd599f5bd6b1bd70e068e48b1d7bd14cda
+DIST sysrepo-2.1.64.tar.gz 722294 BLAKE2B 55f71bd2bfa987775d324763d989f57ef79c74d45c261e2f880740201ca5585107459f849d915e3bf4084c9f5ff538a7867787ce53145ad1a64e418384e3558c SHA512 363d6a0dd057326125aa11c51bb1e80a2a521708a95b95eecf2b416a2ebd938b5ac6b8ae49311376bfbae5599679e23f62503da946920bffb48379c665183b40
+EBUILD sysrepo-2.1.64.ebuild 776 BLAKE2B 3e6dd00c074d731486e9018b8f18330fecbf0e9ad53bd1c188b8e244addbdd048269b0599c5b7e4b6be05a3aaef55c134e7b531036b0cce1314228bbab19fe71 SHA512 ecc9a8ebde90c90e3548c71bb75450862917c2266cbe8ce536e436604f0d155ed01ff5e7ac2ce8568503bcaff4d6e182624e484c02e7f8c1d92cd80d07201cc1
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.1.42.ebuild b/net-misc/sysrepo/sysrepo-2.1.64.ebuild
index ff659f5568e9..86607e642736 100644
--- a/net-misc/sysrepo/sysrepo-2.1.42.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.1.64.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=net-libs/libyang-2.0.164"
+RDEPEND=">=net-libs/libyang-2.0.194"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 49eaab6551ff..a7e4fcd7301d 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,17 +1,12 @@
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
-DIST teamviewer_15.21.4_amd64.tar.xz 59986736 BLAKE2B cfc437d5af70ff67358642ef7283a7d6c7be5fc49519f36ce9da962105ad194e3e4c485d993535f4f8979c37c01515ae0221a7f18f397b6ac74f1935ec4834d2 SHA512 49b060326a41951655763480b995dbd4d51d00f71262daae85b025d4fb69548a52601fba9520668f1292cb635a2434f081ec2f2eacceae5e03c88bba9b80b8bf
-DIST teamviewer_15.21.4_arm64.tar.xz 60252416 BLAKE2B 54895af7df588a03d136029c39f3107a4a634bc60f2d032d02e87e31ec11730cddc033895ac15ca4b2050500bcca1cfed484561459146b051ccc2c865230bfe6 SHA512 4640362b54e3a25962ccb29ea436d0928f19433ef07a946e515f972ba130932ce6bcf3ed403178f39e70735bf881bae56f56ce38fe8c4547b6a09d7ba859243b
-DIST teamviewer_15.21.4_armhf.tar.xz 54634980 BLAKE2B 152a42be4dc340f567034f2425c8a92c600000d1219f8d5ddaf0af78e3a720990d6375ee2724d3e8728958fce890a427d3ac0f36643a1af68f43f253cf43eac4 SHA512 fcb6551c47ed5d14a1b39540d93b50da7bc559a49dae907c406e10a15a29609514488a752ddfeefd10e0f5a00d0ec3a551d811cf421a1d7f46461a2507a385c4
-DIST teamviewer_15.21.4_i386.tar.xz 63280600 BLAKE2B c224b71cdfc01c8327503a6464c46b5e3c06f4886bbd40d93cc65662f6c53dee6bc0319a675117fac1670d98523186805b8bd002fda5cb7503a45a32c733c316 SHA512 933a09a41d42423aa4dbd6879ca9ed64dcc21ca2fb91aa1a9391fee7aee3d6e382635f20dbeeffebf9de3cb36b91f240668d4792a0d60a94ccfbf912289a385c
-DIST teamviewer_15.23.9_amd64.tar.xz 63137476 BLAKE2B fcdbb980514f7261b75b23556c538c64ba620c210c1a4ff8ca8300590f92eb4551e67d1669a835fccd5382bc8e5f347876544e994ca92c50585c2113548bb45d SHA512 e504931de01f4cf8ec5a246563584e898a14f11a4714307b321b01c62cfb7e2774398680d532df4e799259bea7e77dbf82e8c368d7ac981f99b87a2745f08304
-DIST teamviewer_15.23.9_arm64.tar.xz 62300228 BLAKE2B 2f27d6cee782d756e8007120e2dc847960b2011fff016c20745bb429d28bf07d3eef6bf4f4ac8411c1133dcd9ed3792e409dc6c3181b6a60afe98364e6fe1b7d SHA512 af3a9d3556918287bffadcaecc4f42b3a8435f60c5238d9091ae917f71c259458c3393cee8c3b3866617fd8bed67835519f9b1efe9d7ff6e4422f0fa6dc58dd4
-DIST teamviewer_15.23.9_armhf.tar.xz 56261744 BLAKE2B 24c1c4eb600d4ec7a8a5d0df002b5b54fdceb3e623bcb89dbbd4161ef5d2cf645ba1ff69f17708b996c1cdba5df50c262c6273f8491182006fd509a7ce636114 SHA512 5a767a53a12f4852395731e549be2d7ce2e674e127472b5c80999eff50b52a2781432cc39af3104e7bf16aa95bb63b14831ab197ea6c2c81d9021531ca8279c9
-DIST teamviewer_15.23.9_i386.tar.xz 62347476 BLAKE2B 2e9e6c27c2da518b21c1be6e281e9bb00b2ff2ab8618511b575853f2f8d3c0c159a5b89388a982a0958e9afd2da04de4036c524d56b741f45639b37ee90d1d60 SHA512 d209b246aaf48d998f69664d35788513a2b5d1ebb213e08639b0f35192859188e4556bc7470a4117d30852e5becc3d87355bf8ac0f78d5214f804a9d9e58da90
 DIST teamviewer_15.28.6_amd64.tar.xz 62382804 BLAKE2B a5ca2d7ec2ebcd0d374d7e2111be01eaea39c04ff0d4aedacf5bbcb415044a9a2adefc33a6822484cb40616f180be3fa8b6359a20a48ee3b908f1edf8fc2b946 SHA512 eb41417a43ff51562de399ca35a983e16d9b0aca09906c6c2f04154dbf65ecef924311887f9f863339724ecc7f408dd9d2e3122bd090e669517f07c3924958b9
 DIST teamviewer_15.28.6_arm64.tar.xz 63715936 BLAKE2B 86113dc1964eeb3af1f77e5a617cd6865bcc42e1bd14ee0477cb1ced4834e9d93169126f41b54b7db3f7099280386a79da7743ca2b019b835bdadd9253d28f88 SHA512 7b8ded4eb686487936ffe8789832c43dc3c0a14b902ecb855b4de31b49dfa4f3964fb576a0531dc993015bbf6e3bad5de589097a0c3ef8c3420f4999cb6ce519
 DIST teamviewer_15.28.6_armhf.tar.xz 57518200 BLAKE2B 78155d0efb4946c38e2c93c8071c3b01c9b9edd2c9a9c6228a8a6d6daa2075dfb81296580b25d16969a5dbcae256e0154ff848b02bd1ffd3ff76d448cd7b24a2 SHA512 050b316fa182a74a739f6d6dae285d3abc0ff305f4057c4cfd98583cca205006e4f26c4cd7b5ee7a3c31881f7625faae3e1df8164d14139d1e2fd3338206a021
 DIST teamviewer_15.28.6_i386.tar.xz 66093276 BLAKE2B 80c1454539752f84790fc53288626a64921317ca94659b0846e1870a76c015367000707f08d924c2df331295001cb0ae73155d110f6005a104d3bca4a05d25dd SHA512 f340adc495352e8b70e98e9f79455087353907dfd37203213050d226edc284bd819ee70cd326b6495e2019e3fb55de70f9cf73022345e275f979c91cde9ce341
-EBUILD teamviewer-15.21.4.ebuild 4892 BLAKE2B d977b161210d48da5deae5a13f9b7bc26ec6d958ef0c86eed82b25adcb7422cfb2242014c77421cf13b4946f552a0cffb2a96addd1baadf9377b285ae03e410f SHA512 79d960bdf2d4615a22d26cb1d32014be4812ce5f669965ceef1880c7d1597c092b602b58eaedc39ec89bdafea36c7968dc02352ab75cb975cd27c6d1cd61e833
-EBUILD teamviewer-15.23.9.ebuild 4887 BLAKE2B e869a3cf949bc8c4e021c3bb431d976ab417729820cb5c000c5f3ff2d26da85dcd78041bbf9a41a988fa505b17637f88bdef10a34d6f11f7e7048f06d4e3ea2e SHA512 6bb95f871fbd7bdf169895553c02d6dce662260ce0cfb35e8881e5d2c5d4365d836c34ceed237b8e8a8e10bb2f2826822f61f38ddaca9015ef891c59db72ac52
+DIST teamviewer_15.30.3_amd64.tar.xz 64105604 BLAKE2B f109daa08dd56fbe5852a144823c7d511c3af0069767fd9bdc2e4b0bc3c264e3741c663b3713c57bd27d3b9963c0aa4c5f2505018e52f37712ea4d9b12d9eb97 SHA512 375a99fbddf4af76f453d35b9102fb4a52e1079bc568d36a379a7935522813b2c98bec8c369b24605fd66811c76cec0c49adaf32c5a7ac9c76eab1264de7bbfd
+DIST teamviewer_15.30.3_arm64.tar.xz 66193152 BLAKE2B a62096f527ab7745a6a4c3d4bd31d9cc59f93388b5bd31321de2c9f807671a7761ca9296b18d287a959072a16e8a92b6477d70e6afad8d3a5e2fdcb93f03ca89 SHA512 18dcc473b6e7922ab271c4c3d1a7556a49ab92131ea21a476bb777329d0a138a64fedf6e232476b084cc207b3d1358c591af2d3236165dafca0d87347e7b7a08
+DIST teamviewer_15.30.3_armhf.tar.xz 58911308 BLAKE2B 5b9215240ae5957ea66faf766c59a1d8fd6026208a47a36be1a4f7bfe86073e0829114465715eb03c60ca08c13943e57e30374df738dfb6369d124ad66706c61 SHA512 eff506206f06bbe285af73031a475764ced5d7ca99587285e9ef5838243b54c2d14d99caed1282d4b3c21dd71a75b01a035c46d71af5d05951041e9fab1a7e73
+DIST teamviewer_15.30.3_i386.tar.xz 68610636 BLAKE2B cadbc2b768ea155a016ab08008c2a25496e7e894fe58b156883f8001f0c5fde6a2ac5b8ad827fe6e6b1522afce3f9617a9a575dbdbc4763eeb2e997f9ddb5d14 SHA512 03b71778045e039d8c1400bff5e32e02dbe10235c74b2e0f977a0cb263cbcdc41e8dae842884826a13855edd9a7791c02c6df7a7cc04678a810f75c01fc9f770
 EBUILD teamviewer-15.28.6.ebuild 4522 BLAKE2B f79168e36b016dcefd00818caf91a16de93cce98cf67ae52a41ed02577bcd29d74f75a2b8c2c9f7fd1cc839e3c52f8c1c9360647feab4f99dd73f3cb01204651 SHA512 ce7120c5226ac257e7e9c2309abc4e3817a16222eb39ea0679c4643c734438ca6d931098d89a744df61f3403c01cf895cb06c2f5095c93966252fff9c1750418
+EBUILD teamviewer-15.30.3.ebuild 4522 BLAKE2B f79168e36b016dcefd00818caf91a16de93cce98cf67ae52a41ed02577bcd29d74f75a2b8c2c9f7fd1cc839e3c52f8c1c9360647feab4f99dd73f3cb01204651 SHA512 ce7120c5226ac257e7e9c2309abc4e3817a16222eb39ea0679c4643c734438ca6d931098d89a744df61f3403c01cf895cb06c2f5095c93966252fff9c1750418
 MISC metadata.xml 398 BLAKE2B 445ffd891e67241252fcac645e4506315a23501976a36522f4bc9065b712e5b519f78bc523707014ab71dfccc796248094cc51edc43a0ecf9a1a3957a31d07c1 SHA512 a6364c26016b8fdcb0388f839fd1c04c83c0f83eff1661df75173eb81b426b6df9e3bb7ed1f44cce89010e8a94fbf12323d39a6534c4ae5105d7aa0a4883b0e3
diff --git a/net-misc/teamviewer/teamviewer-15.21.4.ebuild b/net-misc/teamviewer/teamviewer-15.21.4.ebuild
deleted file mode 100644
index 156bef4ed7c7..000000000000
--- a/net-misc/teamviewer/teamviewer-15.21.4.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature systemd xdg
-
-MY_MAJOR="$(ver_cut 1)"
-MY_P="${PN}${MY_MAJOR}"
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}"
-SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz )
-		arm? ( ${MY_URI}_armhf.tar.xz )
-		arm64? ( ${MY_URI}_arm64.tar.xz )
-		x86? ( ${MY_URI}_i386.tar.xz )"
-S="${WORKDIR}"/teamviewer
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror"
-
-# Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027
-BDEPEND="app-arch/xz-utils[extra-filters]"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libglvnd[X]
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:0/1[minizip]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-"
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -i \
-		-e "/^ExecStart/s|${PN}|${MY_P}|" \
-		-e "/^PIDFile/s|/var/run/|/run/|" \
-		tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_P}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend || die
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	local exe
-	for exe in $(find tv_bin -type f -executable -or -name '*.so' || die); do
-		fperms +x ${dst}/${exe}
-	done
-
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	local size
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png
-	done
-
-	dodoc -r doc
-
-	# Make docs available in expected location
-	dosym ../../usr/share/doc/${PF}/doc ${dst}/doc
-
-	# We need to keep docs uncompressed, bug #778617
-	docompress -x /usr/share/doc/${PF}/.
-
-	keepdir /etc/${MY_P}
-	dosym ../../etc/${MY_P} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_P}
-	dosym ../../var/log/${MY_P} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn
-	ewarn "Please note that the teamviewer gui works only when started from"
-	ewarn "a session initiated by a display manager." #799137
-	optfeature_header "Install one of the following display managers:"
-	optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please note that parallel installation of multiple versions of"
-		elog "TeamViewer is currently not supported at runtime. Bug #621818"
-		elog
-		elog "Before using TeamViewer, you need to start its daemon:"
-		elog "OpenRC:"
-		elog "# /etc/init.d/teamviewerd start"
-		elog "# rc-update add teamviewerd default"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start teamviewerd.service"
-		elog "# systemctl enable teamviewerd.service"
-		elog
-		elog "To display additional command line options simply run:"
-		elog "$ teamviewer help"
-		elog
-		elog "Most likely TeamViewer will work normally only on systems with systemd"
-		elog "or elogind. See this thread for additional info:"
-		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
-	fi
-}
diff --git a/net-misc/teamviewer/teamviewer-15.23.9.ebuild b/net-misc/teamviewer/teamviewer-15.30.3.ebuild
index 0d60c13390df..733ad3a3da07 100644
--- a/net-misc/teamviewer/teamviewer-15.23.9.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.30.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,7 @@ RDEPEND="
 	media-libs/libglvnd[X]
 	sys-apps/dbus
 	sys-apps/util-linux
+	sys-libs/glibc
 	sys-libs/zlib:0/1[minizip]
 	x11-libs/libICE
 	x11-libs/libSM
@@ -73,14 +74,6 @@ src_prepare() {
 src_install() {
 	local dst="/opt/${MY_P}" # install destination
 
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend || die
-
 	insinto ${dst}
 	doins -r tv_bin
 
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index 502794180dd9..9e18bd9e05dd 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -4,5 +4,5 @@ AUX telnet-bsd-1.2-musl.patch 1097 BLAKE2B 3b2d7424a04abd910cc6dcb94b8ca740ed7a2
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
 EBUILD telnet-bsd-1.2-r2.ebuild 987 BLAKE2B 6dac32fbd4f801b5bdd417508aca59e167e321fc7404d29cabcda4ab86adc68f8bd1830b762c970ef141a62fae14c3c384911bdba2ff1605163cd6d6336fe60c SHA512 b2b4c7d5f80bb63d5283d9f1b57949ec8d6d60f3d2c2855c3376c08731ba5a4d14849e4772796a54f0b4d6e8df3c7effddb1e44f78036651089f587ced3f20d8
-EBUILD telnet-bsd-1.2-r3.ebuild 1025 BLAKE2B 1c616145fcc1126016273e71c478fa3d9bb4ba15db30c47f2c051f262f412a30fb3dd1b61864da9a597318aeb6d39110b4c7699132afc087d204ff0f0bd81c68 SHA512 e4c5834c0813c352ccd3cf927318899dcd44a2eed8700dbd931dbf68d7b27d8533d69f2b3ddd5f1e646598a2eb6e8ef9391185424add5556da26cec2f80fe142
+EBUILD telnet-bsd-1.2-r3.ebuild 1032 BLAKE2B e97ba174fec6774c6ca82136010303d53347a61c579535c7bb2174700ea7648890f3e6ec62e066322ce6c124aced8da150e06b69a77a104af141b3e664d2daed SHA512 db98a04727c49cb0bce6c1d411ae28fb1f52c13edffc46d92f1247310555c0f565a5a9c855f149c24f48129cefac56a2b9eb7462f8ed6d0288602fde5d948e73
 MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
index c131d25aed1d..db4c5fe6c4dc 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="nls xinetd"
 
 RDEPEND="
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
new file mode 100644
index 000000000000..4c70dd855c94
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -0,0 +1,2 @@
+EBUILD tigervnc-xorg-module-1.12.0.ebuild 443 BLAKE2B b5b3b191f1bbcf91079432278455515737ddfb498b2ce1e1e4c903aa061dac3d68931d2bb22a1cce863eaf8dba401b305c813c7aa726a24374625d5e19ab7b01 SHA512 19304fe99969891af13f4561df79cdaba28c05ae7e075880b28bffeb041c4caa37b43544801991a3fb46bff1b04a516e75a6307b89edf8ae57c2e96b253dffc7
+MISC metadata.xml 485 BLAKE2B 60d5a68107539d984a06565930cdf14edbe85d5f3a00d1879d3d3ec57b5b345918b2a2041fd549552f732434f63161ab55e792778f4d15e11e4cbb072ba94bd8 SHA512 d5caf47966a216eda3136a98617c9acec6a67365048b53e832edfeb5f9c8159804116826901087f2903c769076dbe09f60f2387bdae14712ce78bc6cbc7a4954
diff --git a/net-misc/tigervnc-xorg-module/metadata.xml b/net-misc/tigervnc-xorg-module/metadata.xml
new file mode 100644
index 000000000000..c9acc8f7d177
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">TigerVNC/tigervnc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
new file mode 100644
index 000000000000..5813135ac84c
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://www.tigervnc.org"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+
+RDEPEND="
+	~net-misc/tigervnc-${PV}[server]
+	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 019f6e20ba0e..6f62f4ef974c 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -3,18 +3,9 @@ AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
-AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e
-AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c
-AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
-AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8
-AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8ffadacd7c394f0bd5ac82a0d5b6a023c020a5125112807762b5260f07180f591009bd22eeb6d9a1324bae64caca7dd6aaba SHA512 aa980e28568df01f4589c258e293df1499c8d7d8d2e37a0bb52c240efb0fcb45f862f382633c389ba60283b6776e33e642acf3544bb89832bd2980bb80908e30
-AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
-DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
-EBUILD tigervnc-1.12.0-r5.ebuild 4907 BLAKE2B b3b7f361196e6b58fbfac738b45f6ac1a873eee1af28db51054856829cff620f75c06d44a24ebb0eeca2348873afe517f6451616b90620bd4a37eefdd1557f93 SHA512 a00d73c9212f8ffb8208a391ae5c375841cc525bb62091d90386b9d5d2c2356ab5e3936bc56e358f18f31240744ad3d4a7dff6c769bf893f989f0532618f6769
-EBUILD tigervnc-1.9.0-r2.ebuild 4221 BLAKE2B 5d9ee5be8f6a8b23c62959105a5dafac0db043e6c76462b9c8aa5c1fb9ee56985d08d750f754f030055796980ef3e2987d41af6247bc07431403e5494a0cbd19 SHA512 9937b4ef4d969d329fd04ed372cbc079e4f1f17397cc22d41c08cb464625e9ee6cf6f771cef2e5c6d45e947ebe28851bd45dae08186bcd489c418ff1be8642c0
-EBUILD tigervnc-9999.ebuild 4072 BLAKE2B 8d9d1d942146ee2fd64e597bb362b444b88933fdbbf0412dcca117dc2be6abbb77e4260788fba900a00698e5b61b8742905d64c5587f2e1470aa6631cbcf72ef SHA512 a7e0a4b8a74a52296e157577c34de37bb70202171e37d2ea36af68860fdc86b72c4ee79bec18edf413e39ee98716444f44313a5e01c07674494bed963a59ab4a
+EBUILD tigervnc-1.12.0-r6.ebuild 4869 BLAKE2B fcc19219cd2e0ee342688d559c8617ff5389175fea7207e644a4340edc0dcf513352a8d8bcace7337a826ae1903d16a7d5cbb647ef15340c95cf778beeee0036 SHA512 6e298bf5dd7753e9a7273a6fd9521d101db8dfe052d2c1c8c6812ce0be57e31f2eeea94cc11ad19d620e9deceab14e3c429de81127163232c8404ad7af9b7baa
+EBUILD tigervnc-9999.ebuild 4772 BLAKE2B 3178336b98683506997a61e608e808176ff1cda1146935f07036a8616a2bf9117a63cafb94155cb2389a79ce7a48a9139ffb18bc683d6aabe893d72ea6aa3b46 SHA512 0e7881455d578c887b5455c78786d0af3337ffdd149aeb837102a4ee7473ca127e0e6f92a676f6bdc2808f84102155ee3fe437c7a614763ea7cf8df15ccf830c
 MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
deleted file mode 100644
index 8a30f18d7d92..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index 9e7a6ac5..139f9601 100755
---- a/unix/vncserver
-+++ b/unix/vncserver
-@@ -684,6 +684,7 @@ sub Usage
- 	"                 [-geometry <width>x<height>]\n".
- 	"                 [-pixelformat rgbNNN|bgrNNN]\n".
- 	"                 [-fp <font-path>]\n".
-+	"                 [-cc <visual>]\n".
- 	"                 [-fg]\n".
- 	"                 [-autokill]\n".
- 	"                 [-noxstartup]\n".
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index f076565f..05669a42 100644
---- a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -352,6 +352,11 @@ static void usage(const char *programName)
-           "       %s [parameters] -listen [port] [parameters]\n"
-           "       %s [parameters] [.tigervnc file]\n",
-           programName, programName, programName);
-+  fprintf(stderr,"\n"
-+	  "Options:\n\n"
-+	  "  -display Xdisplay - Specifies the X display for the viewer window\n"
-+	  "  -geometry geometry - Standard X position and sizing specification.\n");
-+
-   fprintf(stderr,"\n"
-           "Parameters can be turned on with -<param> or off with -<param>=0\n"
-           "Parameters which take a value can be specified as "
-diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man
-index 729c01d6..07dc58f1 100644
---- a/vncviewer/vncviewer.man
-+++ b/vncviewer/vncviewer.man
-@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from one of "Tight", "ZRLE",
- Disable lossy JPEG compression in Tight encoding. Default is off.
- .
- .TP
-+.B \-ImprovedHextile
-+Try harder to compress data (default).
-+.
-+.TP
- .B \-QualityLevel \fIlevel\fP
- JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
- \fB-AutoSelect\fP is turned on. Default is 8.
-@@ -296,6 +300,11 @@ respectively.
- .B \-AlertOnFatalError
- Display a dialog with any fatal error before exiting. Default is on.
- 
-+.
-+.TP
-+.B \-ZlibLevel
-+Zlib compression level.
-+
- .SH FILES
- .TP
- $HOME/.vnc/default.tigervnc
diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch
deleted file mode 100644
index 8b50d8ccf159..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index 9e7a6ac5..fff53bdb 100755
---- a/unix/vncserver
-+++ b/unix/vncserver
-@@ -63,27 +63,7 @@ $defaultXStartup
-     = ("#!/bin/sh\n\n".
-        "unset SESSION_MANAGER\n".
-        "unset DBUS_SESSION_BUS_ADDRESS\n".
--       "OS=`uname -s`\n".
--       "if [ \$OS = 'Linux' ]; then\n".
--       "  case \"\$WINDOWMANAGER\" in\n".
--       "    \*gnome\*)\n".
--       "      if [ -e /etc/SuSE-release ]; then\n".
--       "        PATH=\$PATH:/opt/gnome/bin\n".
--       "        export PATH\n".
--       "      fi\n".
--       "      ;;\n".
--       "  esac\n".
--       "fi\n".
--       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
--       "  exec /etc/X11/xinit/xinitrc\n".
--       "fi\n".
--       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
--       "  exec sh /etc/X11/xinit/xinitrc\n".
--       "fi\n".
--       "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
--       "xsetroot -solid grey\n".
--       "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
--       "twm &\n");
-+       "exec /etc/X11/xinit/xinitrc\n");
- 
- $defaultConfig
-     = ("## Supported server options to pass to vncserver upon invocation can be listed\n".
diff --git a/net-misc/tigervnc/files/tigervnc.confd b/net-misc/tigervnc/files/tigervnc.confd
deleted file mode 100644
index e651dbbe7889..000000000000
--- a/net-misc/tigervnc/files/tigervnc.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/tigervnc
-
-# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display".
-# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
-# DISPLAYS="myuser:1"
-
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
-# VNC_OPTS=""
-
diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd
deleted file mode 100644
index 06a154257e6f..000000000000
--- a/net-misc/tigervnc/files/tigervnc.initd
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -n "${DISPLAYS}" ]; then
-		if [ $1 = "start" ]; then
-			local user
-			for user in $DISPLAYS; do
-				if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
-					eerror "There are no passwords defined for user ${user%%:*}."
-					return 1
-				elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
-					eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}"
-					eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
-					return 1
-				elif [ -e "/tmp/.X${user##*:}-lock" ]; then
-					eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock"
-					eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
-					return 1
-				fi
-			done
-		fi
-		return 0
-	else
-		eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
-		return 1
-	fi
-}
-
-start() {
-	checkconfig start || return 1
-	ebegin "Starting TigerVNC server"
-	for user in $DISPLAYS; do
-		usrname=${user%%:*}
-		usropts=VNC_OPTS_${usrname}
-		usrdisp=${user##*:}
-		usrvar=$usropts"["$usrdisp"]"
-		[ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
-
-		# A user may have an invalid shell, so we default to /bin/sh if its the case
-		if [ -x /usr/bin/getent ] ; then
-			usrshell=`getent passwd ${user%%:*} | cut -d: -f 7`
-			case "$usrshell" in
-				*/bash|*/ksh|*/sh|*/csh|*/tcsh) ;;          
-				*) shell="-s /bin/sh" ;;
-			esac
-			echo $usrshell $shell
-		fi
-
-		su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null
-	done
-	eend $?
-}
-
-stop() {
-	checkconfig stop || return 2
-	ebegin "Stopping TigerVNC server"
-	for user in $DISPLAYS; do
-		su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null
-	done
-	eend $?
-}
-
-restart() {
-        svc_stop
-        svc_start
-}
diff --git a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch b/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch
deleted file mode 100644
index 4028ebb74518..000000000000
--- a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3.c xorg-server-1.20.0/dri3/dri3.c
---- xorg-server-1.20.0.orig/dri3/dri3.c	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/dri3/dri3.c	2018-06-13 19:32:52.131915519 -0700
-@@ -26,7 +26,7 @@
- 
- #include "dri3_priv.h"
- 
--#include <drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- static int dri3_request;
- DevPrivateKeyRec dri3_screen_private_key;
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3_request.c xorg-server-1.20.0/dri3/dri3_request.c
---- xorg-server-1.20.0.orig/dri3/dri3_request.c	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/dri3/dri3_request.c	2018-06-13 19:33:46.164444267 -0700
-@@ -30,7 +30,7 @@
- #include <xace.h>
- #include "../Xext/syncsdk.h"
- #include <protocol-versions.h>
--#include <drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- static Bool
- dri3_screen_can_one_point_two(ScreenPtr screen)
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3_screen.c xorg-server-1.20.0/dri3/dri3_screen.c
---- xorg-server-1.20.0.orig/dri3/dri3_screen.c	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/dri3/dri3_screen.c	2018-06-13 19:33:13.885725528 -0700
-@@ -29,7 +29,7 @@
- #include <misync.h>
- #include <misyncshm.h>
- #include <randrstr.h>
--#include <drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- #include <unistd.h>
- 
- int
diff --git a/net-misc/tigervnc/files/xserver120.patch b/net-misc/tigervnc/files/xserver120.patch
deleted file mode 100644
index e823a651ae03..000000000000
--- a/net-misc/tigervnc/files/xserver120.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -urpN xorg-server-1.20.0.orig/configure.ac xorg-server-1.20.0/configure.ac
---- xorg-server-1.20.0.orig/configure.ac	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/configure.ac	2018-06-13 19:04:47.536413626 -0700
-@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- LT_PREREQ([2.2])
- LT_INIT([disable-static win32-dll])
-@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
- 	AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
- 
- dnl Xnest DDX
- 
-@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then
- 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
--	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2565,6 +2571,7 @@ hw/dmx/Makefile
- hw/dmx/man/Makefile
- hw/vfb/Makefile
- hw/vfb/man/Makefile
-+hw/vnc/Makefile
- hw/xnest/Makefile
- hw/xnest/man/Makefile
- hw/xwin/Makefile
-diff -urpN xorg-server-1.20.0.orig/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am
---- xorg-server-1.20.0.orig/hw/Makefile.am	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/hw/Makefile.am	2018-06-13 19:04:47.536413626 -0700
-@@ -38,7 +38,8 @@ SUBDIRS =			\
- 	$(DMX_SUBDIRS)		\
- 	$(KDRIVE_SUBDIRS)	\
- 	$(XQUARTZ_SUBDIRS)	\
--	$(XWAYLAND_SUBDIRS)
-+	$(XWAYLAND_SUBDIRS)	\
-+	vnc
- 
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
- 
-diff -urpN xorg-server-1.20.0.orig/include/os.h xorg-server-1.20.0/include/os.h
---- xorg-server-1.20.0.orig/include/os.h	2018-05-10 09:32:36.000000000 -0700
-+++ xorg-server-1.20.0/include/os.h	2018-06-13 19:04:47.537413618 -0700
-@@ -633,7 +633,7 @@ LogSetDisplay(void);
- extern _X_EXPORT void
- LogClose(enum ExitCode error);
- extern _X_EXPORT Bool
--LogSetParameter(LogParameter param, int value);
-+LogSetParameter(enum _LogParameter param, int value);
- extern _X_EXPORT void
- LogVWrite(int verb, const char *f, va_list args)
- _X_ATTRIBUTE_PRINTF(2, 0);
-diff -urpN xorg-server-1.20.0.orig/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c
---- xorg-server-1.20.0.orig/mi/miinitext.c	2018-05-10 09:32:37.000000000 -0700
-+++ xorg-server-1.20.0/mi/miinitext.c	2018-06-13 19:05:14.742200675 -0700
-@@ -107,8 +107,15 @@ SOFTWARE.
- #include "os.h"
- #include "globals.h"
- 
-+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
-+#endif
-+
- /* List of built-in (statically linked) extensions */
- static const ExtensionModule staticExtensions[] = {
-+#ifdef TIGERVNC
-+    {vncExtensionInit, "VNC-EXTENSION", NULL},
-+#endif
-     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
-     {ShapeExtensionInit, "SHAPE", NULL},
- #ifdef MITSHM
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 5a4087287b50..5bbb399656a0 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -19,11 +19,14 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
-REQUIRED_USE="dri3? ( drm )"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	opengl? ( server )
+"
 
 CDEPEND="
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
 	x11-libs/fltk:1
 	x11-libs/libX11
@@ -52,7 +55,6 @@ CDEPEND="
 		x11-apps/xsetroot
 		x11-misc/xkeyboard-config
 		opengl? ( media-libs/libglvnd[X] )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
 	)
 	"
 
@@ -168,11 +170,7 @@ src_install() {
 
 	if use server; then
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 
 		newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
 		newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
@@ -202,6 +200,7 @@ pkg_postinst() {
 
 	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
 	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
 		optfeature_header "Install any additional display manager package:" && \
 		optfeature "proper session support" ${OPTIONAL_DM}
 }
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
deleted file mode 100644
index 8b4f9d535a12..000000000000
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	java? ( virtual/jre:1.8 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( virtual/jdk:1.8 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-030_manpages.patch
-	"${FILESDIR}"/${P}-055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	# do not rely on the build system to install docs
-	sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
-		cmake/BuildPackages.cmake || die
-
-	cmake_src_prepare
-
-	if use server ; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa ; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake_src_configure
-
-	if use server ; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server ; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 90b341d3f1e9..903570b2dd06 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -2,74 +2,85 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic git-r3 systemd xdg
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://www.tigervnc.org"
+HOMEPAGE="https://tigervnc.org"
 SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
 EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dri3 +drm gnutls nls +opengl server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	sys-libs/pam
+	x11-libs/fltk:1
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-libs/libxcvt
 	x11-libs/pixman
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
 		x11-libs/libXau
 		x11-libs/libXdamage
 		x11-libs/libXdmcp
+		x11-libs/libXfixes
 		x11-libs/libXfont2
 		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
 		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
 		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
 	)
-	xinerama? ( x11-libs/libXinerama )
 	"
 
-RDEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)"
 
 DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
+	drm? ( x11-libs/libdrm )
 	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
 		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libxkbfile
 		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+		opengl? ( media-libs/mesa )
 	)"
 
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+)
+
 src_unpack() {
 	git-r3_src_unpack
 	unpack xorg-server-${XSERVER_VERSION}.tar.xz
@@ -100,7 +111,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
-		-DBUILD_JAVA=no
+		-DBUILD_JAVA=$(usex java)
 	)
 
 	cmake_src_configure
@@ -113,7 +124,6 @@ src_configure() {
 			--disable-config-hal \
 			--disable-config-udev \
 			--disable-devel-docs \
-			--disable-dmx \
 			--disable-dri \
 			$(use_enable dri3) \
 			--disable-glamor \
@@ -130,7 +140,6 @@ src_configure() {
 			--disable-xorg \
 			--disable-xvfb \
 			--disable-xwin \
-			--disable-xwayland \
 			--enable-dri2 \
 			--with-pic \
 			--without-dtrace \
@@ -165,10 +174,17 @@ src_install() {
 			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 		fi
 
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
 
 		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
 	else
 		local f
 		for f in x0vncserver vncconfig; do
@@ -177,5 +193,15 @@ src_install() {
 		done
 		rm -r "${ED}"/usr/{sbin,libexec} || die
 		rm -r "${ED}"/usr/share/man/man8 || die
+		rm -r "${ED}"/etc || die
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 5d3b298ef5a5..1441d0afdcd9 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,4 +1,7 @@
 AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786
+AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517
 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
+DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec
 EBUILD turbovnc-2.2.7-r2.ebuild 2696 BLAKE2B a03f3d8f43871bdaedf3010b914e05580827a45579bca9c400a7bb533514956c920cde88fd67b9e0211a9df1b0c28f149791021e5854e0a913c5cdd7413cec59 SHA512 7b04acfbcb3e34c12c11baa36d11ed5de8a05a42bac8fc3068a1fde118999d0850fad349b7db92b6de3e44759f83bfc7e31e57c699b5460018979c8964ab86bb
+EBUILD turbovnc-3.0.ebuild 2059 BLAKE2B 524fb9f0d232ad10f834d929b55769f6c7f474ab7027b63f61588894bdadc9efe71c80709d761168df8e58b686e1b501655ebf4b3784fd4890fb32ac7cfcd52b SHA512 69517cdf41a87d09b2401565929313f0904496f80ff37085f9914e4ba80507dc98d5c6db78797a064aead0ef93bedf14b9d0d672404329fdac3f2951a4ac1237
 MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9
diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
new file mode 100644
index 000000000000..d96b7bc1ca28
--- /dev/null
+++ b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
@@ -0,0 +1,20 @@
+See bug https://bugs.gentoo.org/836723
+
+The error is this:
+
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds':
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known
+ 1178 |     struct ucred peercred;
+      |                  ^~~~~~~~
+
+--- ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt~	2022-06-12 15:41:05.980270914 +0300
++++ ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt	2022-06-12 15:43:14.113823213 +0300
+@@ -1,7 +1,7 @@
+ include_directories(../render ../../../lib/libsha1)
+ 
+ add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP
+-	-DHAVE_SHA1_IN_LIBSHA1)
++	-DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE)
+ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+ 	add_definitions(-DLOCALCONN)
+ elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/net-misc/turbovnc/turbovnc-3.0.ebuild b/net-misc/turbovnc/turbovnc-3.0.ebuild
new file mode 100644
index 000000000000..26c0c3cbe94e
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop java-pkg-opt-2
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/"
+SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ssl"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	media-libs/freetype
+	>=media-libs/libjpeg-turbo-2.0.0:=[java?]
+	sys-libs/pam
+	sys-libs/zlib
+	virtual/opengl
+	x11-apps/xauth
+	x11-libs/libfontenc
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfont2
+	x11-libs/libxkbfile
+	x11-libs/pixman
+	x11-misc/xkeyboard-config
+	java? (
+		>=virtual/jdk-1.8:*
+		x11-libs/libXi
+	)
+	ssl? ( dev-libs/openssl:= )
+	!net-misc/tigervnc
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/xtrans
+"
+
+PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch )
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_SYSTEMX11=ON
+		-DTVNC_SYSTEMLIBS=ON
+		-DTVNC_BUILDVIEWER=$(usex java)
+		-DTVNC_BUILDHELPER=$(usex java)
+		-DXKB_BIN_DIRECTORY=/usr/bin
+		-DXKB_DFLT_RULES=base
+	)
+
+	if use ssl ; then
+		# Link properly against OpenSSL to ensure
+		# we catch e.g. ABI change
+		# (i.e. don't dlopen it)
+		mycmakeargs+=(
+			-DTVNC_USETLS=OpenSSL
+			-DTVNC_DLOPENSSL=OFF
+		)
+	else
+		mycmakeargs+=( -DTVNC_USETLS=OFF )
+	fi
+
+	if use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+	fi
+
+	# Don't install incompatible init script
+	rm -rf "${ED}"/etc/init.d/ || die
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
+
+	einstalldocs
+}
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
index 31c354944a93..cec2e32f6977 100644
--- a/net-misc/vconfig/Manifest
+++ b/net-misc/vconfig/Manifest
@@ -1,3 +1,3 @@
 DIST vlan.1.9.tar.gz 176135 BLAKE2B 195acf3d3bf12de3d11856ec3fdab9791d744af8a5c0003d42a2dd8dda5b22d92bdb43aac392a2c3281cf43f67c2b05dc442352f1cfb589bc540593a92a2a46d SHA512 7602679c1f1569d1742da37062213fea3a14b875bec9c41fc6b10c28a09a312db80f6eae4a8641a1892946545b2b4ef4699e61fddd8514469970e334a9dab0c5
-EBUILD vconfig-1.9.ebuild 1113 BLAKE2B 084a270c660bc38426740e3ba1333d08fcb51d1f520707de97af8e01be999c977e24a9f0a30933bff31bcd57776dffd65823484ce8ad5231fca1ca7fd82bf78d SHA512 ef9d23722b0d6a9195522e4271a6b7828f137c845d34a1dd643cd7cfef75fae7c8dfb01c9b6366d87f5c67adf2a20ddd5e34d3cb533d06fd2c8a64bcca333405
+EBUILD vconfig-1.9.ebuild 1127 BLAKE2B 210dcc93e515ba37178d92e928aca0125be8f70d09fe1fdadc4ceee68c68e90de04e1c03216921dbac1f02c0214d50d969c31052e4816973d12f921a43a1b9e4 SHA512 1b5d210f284e425e527d05fe2b5540e377505fd1e0a5eaa4b81bbfc82cfd026973d1bc0b63ff321c58383b5a78e242a28b4bbef2b4951ad02d36f425813c90da
 MISC metadata.xml 491 BLAKE2B 841e0806081bfe0bdd9114438b47bf6d273262f9b9b70295cc5d0049a9a9f973d0f6362c8f530c92f5288263e2d24d9a9ef79b5c630fc762b7a4a5833bda56df SHA512 ebc64c22068ea18cd35bc4d6c91d321c16521cd55ad34f7b54f51461812b69d2636c1affd85bf0e4cc7e03e098afbeb263a70160b3f4ccc0ee36e5d4cb8d3d0d
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
index 793ba8451eb0..6d231ef02de7 100644
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ b/net-misc/vconfig/vconfig-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="static"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/net-misc/websocat/Manifest b/net-misc/websocat/Manifest
index be81844f366d..d3bde159a4e5 100644
--- a/net-misc/websocat/Manifest
+++ b/net-misc/websocat/Manifest
@@ -1,12 +1,18 @@
+DIST aead-0.4.3.crate 14717 BLAKE2B 304e37cb58ebbd8a0ff8f38eb178afad7860cfeb3f1c719f061f4e15282e3cb133089270a1a2dd9299c4007e1963d373578c7fe4139cb222f05a2d15b2313485 SHA512 c1f700a35c5933acc38ca6aa2cb945c4676a4765802d6021c35631de5ace35390a9dc877c1669cfd8789716a73b0397dfe551c32f50774683b0b8573b54fbd77
 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
 DIST arc-swap-0.4.3.crate 48193 BLAKE2B 4335a97b50f1adb2de484202373b004770a8d4c43eb34193e96953d9a926af5370ed288b30c0b0998e023decd4c76484766f20608d03fc7a0b40112748f737be SHA512 3e5ec14c30c2a061dde5bf1b61ffa753745d1b0fc31081c3a52e3c6b83593f790ce7c25d25bc35a50768a31e8f4dcbe63dd12a1606d2d6939f0096a5bdb6c877
+DIST argon2-0.4.0.crate 28732 BLAKE2B c169a2d281c8c26123b3eecaf7b0c1719809632226287ba8fb2263536019e0adacf415b4171c50884a1ea11cb6f0a06815c26d20f1ba4cf4a2cb2c13f06d4a68 SHA512 e88c9705c7cefee3203621c6aa45425714f721a7174b42632d91cc2615ac510c7a1b0d4840bcfa3ec20bdf1156bdc240b8b4f91944c3dcc0eac8e15372f8e4f0
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
+DIST base64ct-1.5.0.crate 27855 BLAKE2B 43eecd5c663529d69e493bdd779da5b923d0598cdd37ace6893e6ca2d4db3db4055b6b568d7725134eb53ddb0f65a496ef68c3040eccb1734fbafef4abe6d12e SHA512 a159f0af9a9e2cb0ae233d3639990ff6d27b891b7c12288e9673563bd613f485ce16e8986f01d3c665931bd98fb32c54e2bd526c40c5482e2edb1c77829aa230
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST blake2-0.10.4.crate 46804 BLAKE2B 694e81198aa92d610a189056558b77765f8231a2dbde4e861396edb57398af30e10c6bfd8bb0b62c2013d4874b5442d3df8857499d0f5fff640649224ac4663a SHA512 ea6fde4969d66de70e0689da8c76efd37c8f70b9f1d1894d5c1e497a980b011cac75ac650170b7f0face9f85f0c35d05e136dcf823e1cbe7df3db58b72c6fa4b
+DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83cc1acdda806b98329a5ddcfdbbafdf511907d99ad7daae271a2981ad0c39de218968c22c3487e21a32817d41c23fa SHA512 8f1d99af7c08bf3b54ba7383cf0272eb5a8137f6244bc2d7e6d6761016614514ad7d27c5c51946c5cd7becd84b320f62fc2770e7aa07038d370505c29e032078
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
@@ -19,6 +25,9 @@ DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a11059
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chacha20-0.8.1.crate 30715 BLAKE2B ce856786955bdc20fc971394b0b4e3afb5b3e8da9b4c5712bd6c773bbe44ae311799c15d2ec8da7efda7230472968d3ff66336c21f0015e3c6015c548e95c543 SHA512 4f17f35e469de65b46ef18e329d41354da22e9dc8d1776ebdfdf620b8afb814ef91b9ed1ce2b81cf67a051b34efc658c12a18e0022f3ca72fea44a9885597d76
+DIST chacha20poly1305-0.9.0.crate 68354 BLAKE2B 66f2e68c672c4bdf40a12a5dc3c1615c687f0105932ba455b39fe327d3cfb785fd107892389c13ec778e8a46fa711820961593f451920e8ac391ba898177057d SHA512 5b9f5c2f4074c24e91c19a482a88c8cac4ac69c8a967f6a85ccaa5acfccb4f2f82a68d6f34e42b150b9c11e57722cd30efb99607a5d75b541491e7b1f5062b6d
+DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
@@ -26,6 +35,7 @@ DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b546
 DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a
 DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
 DIST crossbeam-deque-0.7.4.crate 19868 BLAKE2B a9cb1bba32df38980da7a4042610e514ede6f6ba15abd08629aa28b4a70e8c96030eacddf438df0701c4aea8c07cbdb088ad88b1fef24880a50d234160f44123 SHA512 ebc8bb09a46cb9cd999d8abc034b21016510a086282436aa73416b456ec7893b1c70339e05dab45cdb93bef4435939b0d95826f74bdcbb077e5ff31d15377da2
 DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
@@ -35,8 +45,10 @@ DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
 DIST derivative-1.0.3.crate 39909 BLAKE2B cf76a6a2a82917a09dac420057fa27d405aca3cc4403548633d4ed4f2fb2b8428feb1d76e15f64ca7d8e773b103739a2387495d3fbf9528abba23dfd52c0fc72 SHA512 897bac6fd81555684cecd7afc2a3b6546917562a7637ac0ea4833ab7d74c382383b3452fd554d8ed13a0cc150d9f4484e0c956c16a65404bfef866fc7bf5f0eb
 DIST derivative-1.0.4.crate 42508 BLAKE2B 9996bf596e7646a242acac394c9ec2f5be20b49ce3cc257c26d51fd676740c46114005b05d270e31235f59916ad90238cfc5d30728b5e114b908c74974254f55 SHA512 b6dd82e4ebacc5df58302d2baa8d47eb12aa6d87bb3fb9ef125bce17e163e5a6d921e99e88d9ac91fed402a912e80ff92067a9d6236a8e52f6f8e8435f790623
+DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77a2db5e43488302ac3836adfc87869921e95a2af63e46699419e20d526453ee31f3d7b2171198dc23922dec2 SHA512 bfc9b24e4a6e3df91669a36f8ddcdcfb643e22b3102a200d56bbe88d94e8f1f1e52f5ac29f06253913fbd977b149a3e775c95175b93950340946152f6525803e
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
@@ -51,6 +63,7 @@ DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6
 DIST futures-0.1.31.crate 157731 BLAKE2B bd1c51f7b5c6018547d1aee3ec550fa55ca955b48c04c8e9e91e5aa944540fa69fe590d2296085d7e772c7aaac37dce00624323bd6e31f92af269dcdbf30d511 SHA512 4be7199261201ef4dcdac5a5a237a70eee33d8fad9a81f76d739f4fc7ad39c87fb2f4719ed7e7a7bc5773c5b51196e4aa4ced5375292198c8d89a03f1692b341
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
+DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
@@ -65,6 +78,7 @@ DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094
 DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
 DIST hyper-0.10.16.crate 113115 BLAKE2B 9276328c07d6bee7fc172d8104b6e8f30f0b0fd441937d2f4cb94e54c076a47e32db6a7c90827995c6c5c63e535d2cc6e597d52bca2bede17d117f038d971435 SHA512 22a9c31c490b002c8daf085536abec24cb01c0d63a16e6d153eb3cb165a7338d2109d6f88fa8d343942e2c6d7928d3c5ba62575a404b0dd7811f57e423eca4d9
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
@@ -75,12 +89,14 @@ DIST libc-0.2.105.crate 554066 BLAKE2B e8e3113ee326c02355c700ce5f16b3e037cd576cd
 DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
 DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
 DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
 DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137
@@ -102,25 +118,39 @@ DIST num_cpus-1.11.0.crate 11776 BLAKE2B 00d57b8a05807837fefc6596463d6bd3e781583
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST openssl-0.10.25.crate 185164 BLAKE2B 17cc67db6e4188d111f75f52fa03da910c86ae79d8211f6fa252d04c064ec90a1008efd2d69e0c8a54719d3d547a783bb6950c9bb0525840c31efe45bfe9c7b0 SHA512 db7a8af332c8db921cd07f778bb591a5d013d98848e1772cf5b9550562a5ae55e6459047f4b3263f813dc9a0b8f0bd302ad86dc620b71339bce3136f7daed029
 DIST openssl-0.10.37.crate 207283 BLAKE2B 638eddca70c6dd94197455aff3fc089a3f6d203603efab9522759de67dd2b13c81a68fc47e4cd7b129478acc0d9290de47231c266df8024abe2a0ba159bf82d4 SHA512 bc1644215d0cba6da273fb03c9f18cb3a70af31b7db430eab2cfec630743c035c15a01e95313314b84e515502c87b4c707caf8e1f916476e703122b4d128cd4f
+DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
+DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
 DIST openssl-src-111.16.0+1.1.1l.crate 5095644 BLAKE2B 5c0f1e5348d283355a61d2479dbef138de71cbc459f406bb6765923fd15b7a47e529567e1f10fddf56f3c6d9d1dd9358b671adb465b4f9dad3b7382a6c4df1c6 SHA512 de5723f7745fc3d445856a7e8afa0e1053afeb63d11a13973c772ff94eec9d09a69a593d24d1de0cba289eccd14a079683af554ce5752ea32e7e76c40fe78cf2
+DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
 DIST openssl-sys-0.9.52.crate 45059 BLAKE2B 3c82ea9c70d9e3c7b0959bdef835f6cbfaef89cdab7128fb0cc2fa008eabd5451ffc0495f41c6f0c252364e3826d4cb9fc3f0efc687cbef39c9a7f184a5349ab SHA512 4e0f5b4905d0ee2effa0fe5f44f15496b92cdc91c2abd9ee8a05249f1c1a7a579ab292bd3eb11d279689ce74344d8cca981b41f461b8c61ae33bece1c0446e16
 DIST openssl-sys-0.9.68.crate 54900 BLAKE2B 7a42c1479b68535be636156444e69ff7422cbd8fab522120a1b86e056121a4761287a8a81b6c21bcd25d8fba04dcc40ccb99b1388836f6c79bb1a800109f24c9 SHA512 74bb8e9270bbb97e4ddb9446bc2d5825cf51b04dd7a7e30b23dd5aa01315ff6972aa48c5370822a87c871f029b247ecf34c19d75b00c954de548f51b8118e700
+DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0
 DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
 DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
 DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
 DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
+DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
+DIST password-hash-0.4.1.crate 26074 BLAKE2B 6a6ae652ff53dc15634f753725c86ee3f29a6c800fcf7b79a4513095dd04aba7333087af6edb2856f6d30da42cc3486586b4aed4ce0db1738f5359d4a0e8893b SHA512 3ff20d860a77c0209062de961c0f3f4ac026d86bae7946089d808cd608596ccafffd9a3dee860fb7e0f11ae033477b5e3aa61a85b1a84e5881bcd2d3350f01e6
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107
+DIST poly1305-0.7.2.crate 31868 BLAKE2B afbc7d84f3f67276d1da7d2b1b00d23de35b6b46205e8a4309aa9f1a2abc582cb09b63b28773daffe45074bd250ec77b54923ef8fd422918625179c99b7d410d SHA512 4fff82358985b564b7ee76626854d67221740b6f8540754939899ad3c773809182eaf3e4a2fb697ab382c4a6643116cfbc4756a5a2662eda240625e879e10cdd
 DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
 DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
+DIST prometheus-0.13.0.crate 81774 BLAKE2B cbd6dd2139836327a3b1a4bc29e46b1fffa68484ed765c16d7b0f89d1e4dc8633c639830d8088e02dadd95c5a3eb70e2635a4c4435590747786b1b0879e2b298 SHA512 3259d5fae4cdb1f8d9c84a177d4b023da87ccb6cc366419f9fa08be882c11d7dcd331317ee7ad7a3dac81e69dff3bf594d543f07d761c2ae14757c4b33310440
+DIST prometheus-metric-storage-0.5.0.crate 7129 BLAKE2B 366653e1306c0a32fbb68aefb3ee30099d700e0b92f2795b01ea4bab49e8cf60055765363124386e48597aae20138b25e15967b90e80bbd4cfec6584ece39426 SHA512 08f2479de155acf03c8f8a7e4fba7035a7652cb906aa504b56bfea168dfe70f8f3c398c489d9e92f9dc7a48c8a320b9f2ac5372019b4f32341e9b2a4b778bb87
+DIST prometheus-metric-storage-derive-0.5.0.crate 3719 BLAKE2B 4ed22782a0e09ad68935a4b1bf9df82b1c151766f02a0372cbff0028c2ef747152d20ada17d3bc693b8dd0cd5db3ee8030a4c73d6f50b1c0ab8f276eefb6f540 SHA512 35d3af8a68c65c435f94f3173ad1b2d117b87df7b889fac20c49c0137120c898c6f9bfc066efa73fa8fc8f13ab6cc8e604b1d36a4ce55d984a8fdbc2c8574e2a
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
@@ -169,15 +199,20 @@ DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80
 DIST slab_typesafe-0.1.3.crate 5980 BLAKE2B 8ac675c6c313c13d2f8fc88b44c41314578c0c990335dae8f216daafc3cb0b122042cb54b65b4ca8264c0c6bdb3b6d07edac479f615f23fafc3417d7d6f4115a SHA512 f2dbece513c795f7fac857dfc060034bf61d0d51bb1891566d9c36be97308562033251c11e422020f67bc04bcd9111148f434b55051f69b9ea0d79b072cc410e
 DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
 DIST smallvec-0.6.14.crate 22855 BLAKE2B 5f96c825c57ee6ab80bc13469793dc7ee780cd856e614c6cc0c747e1cd43fd5e27b589652610198e7757252bb6fb25905f616ea82fb9d8a9ffd5c8cd394b4f49 SHA512 4ba563b542922523566efbe0aac9df499c694bea9ba8ba14a74026d516e02f1fa8f542774b8044150a8e27f01a4b1c71c5280b5a82f61d5b45f022ed223f3977
+DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smart-default-0.3.0.crate 6297 BLAKE2B b2e782a64802595b94c6e36b7365b4353ee0a16c5f9477d0222c9862991ebc6841d0f0ceb1dc671da139afe190fc15f3b1c0ece2fc62c897b4a351fee5523072 SHA512 022bfb5321d01cbcca95eb30bfe75bb80bc0f48538cd6434c5ae89252289e3f1daff0a7cd46532ad936f8714544451ac3138a0c3507e9de689dafbe396afd34d
 DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST structopt-0.2.16.crate 26165 BLAKE2B 3609dffe30adc12dd30b3acf6bc1722841ad0823f3199569c616b6cf9502a3b89def471571bdeddff4dbe1722e3b595de3c5b18408b4f4f2015a2db0b51bb517 SHA512 3154f168dabdb6476989970e75d43c8d730f73b567171c0d3bedaa1549ffa13dc543c28b25174efdbb90637b972e9e857dbf2422b95fb55ed9dabbde069e191e
 DIST structopt-derive-0.2.16.crate 12951 BLAKE2B 7b7eddb8854a5bc47b8d91103b2bceaab9057b553c72c4ee6c995dd4392cc9594124cc00562115bc0250b87499f8b8480fb34d8be1434bc55a668a79cfda6c75 SHA512 7ede89d104af3e57e9a78eae16cc8644622b1e83f8ea852ed3cad2e03d3ccb50e5fbd0f3f73cdc32b51bab6607b9b65266012fc7294d48ca0a234875c816a301
+DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e4db9c92d00095607fbdfec0a662deba507afeeee5a173c3c1b99d101268c4692752100198cfaffdda1a64 SHA512 2bdde4584b9d95f93f629083fbedc4a7148aab702775513a602ba2d122ae57a84e6d42c38da820b15ff66743dc49624287daa0c9b6d1fcaeee102b2879ac7a1b
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
@@ -223,6 +258,7 @@ DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680ced
 DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-normalization-0.1.9.crate 89492 BLAKE2B 75fc4a6ba6ae3d9e72380eafd50a727ec049f986a58dedd4854a086af844966701463ef8940fa477685096ed2961e2f044d6a308fc3bccc3046bc92554b7a94f SHA512 f1a96c0687d6394fed55e400183bc37a8f0ab4dc2568eb114f86dda3f504fd9768bf58e1ac87f2ff732dc58041de2f2cb8d9b65faf767243830ddd159ae36d81
 DIST unicode-segmentation-1.5.0.crate 90262 BLAKE2B d13421cfca9e7de0d538dbbc3e44be67abcc3147b847db90d473bbccbfb813788b1cb7ada4f8acfd5646cf83c82bbc47832da893aa06313250ce5f483bffa8b0 SHA512 9f9dfaa6692fbf8dc3f2c22815f79a0eb887eb4706dda9469999826a46999942eec44a608a27858221642fad1591ea9cd5162857c0cc673b45bf648d9ea9b7c4
@@ -230,12 +266,16 @@ DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541b
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
+DIST universal-hash-0.4.1.crate 8503 BLAKE2B 2cb981f8c1b9337f69e4b6672c69c01515009e8bbfaf5236f7db6cea4f3467938be75b4a1aac69433d18ce09361c52bbe99face153417f5105c4ffd050bb2c39 SHA512 fa582c789b462d8b9cf069fe82de47bad5e3a4d88d83d58c82a54fcfe56f44c24a6a63374e050d89162700510e8c87eb74430be30e1da9dbe4a4b6bb80a684e1
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST websocat-1.10.0.crate 97695 BLAKE2B 2d2f5ee284a8e3f3f423d2de0ef6078c84d8bb2374e6021d1bb3bddeacd63d474ab331c2832bf15b8f7bef75febd449f294e6a29dc17367bddcbc2c707473c16 SHA512 e733f2551b106d464ec0daf0ef2c45f4dc3cb1ca77f485441786983666a3db495a6438adc10be9bb5f606ba5dce4ac7011f4f8a618ba6f62a047b7170ca21f2e
 DIST websocat-1.6.0.crate 100266 BLAKE2B a96c5924c61339f4136b69346fdcbfab84a4c3fa21a9b5172434544b7b381c498938972a28bb009f0ff6d8a80eda10199cb5b089ab6911ea4bc9e5ed7f6b7d92 SHA512 6baf95e922891b8bd601768a4193dd9e219339a1a68f6f3280186c2907df54d5239413a09bf8ee48f7faba0e0d62fef6e09a3b871dd48ece831dde8f8a0111f7
 DIST websocat-1.9.0.crate 91763 BLAKE2B e728d67e86fbb2b529508a3cbdcf85a09ad7676126d8edc2b03280ae6c0ee298bc444d849caa930bc8d079b492c412be2ef258ccd4f33309e04ba14f1c6e1348 SHA512 b22955d4de2d966a9196f2ffa13566ac8b1f0a25b0fd62553a512ed572c74f7907a87e517d58bdd3f27fcf4a98c63ae7205d4d42443a2be8dbb3760affbee166
 DIST websocket-0.26.2.crate 63281 BLAKE2B 2392a1e73a932323db224240f386a739f287ea3fc085c0b1d71dbdc3bb2b3f38b3de456701a2e816623de60b8feb0b80c133e439481152c1e67caf986c7185da SHA512 eb732830ca62cb3e90e2fcce54fa00cc7ed9d85be0fc77df8caab2656ce123d35b6c4c0fe9985a18dd080121bd7bdfde82594cb80cec6f72676e4f9829455212
@@ -246,7 +286,15 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST zeroize-1.4.3.crate 15573 BLAKE2B 0ebab6e501bcf32c19ea88fdf038c97468b504c5035b2f2477372326e114231e5c959203b2bc897228a05b19ee510f1264d4fad5e33c5539b5c8bdaaff28889e SHA512 c4f3f10790176925fb90ee6325a50c710ff220bb9d37d424e28e8d8de5f801f2ef5fd687f0b720c471ac9e99e02e26011afcc4ecdd10a8229f70bc71a3815002
+EBUILD websocat-1.10.0.ebuild 4429 BLAKE2B 06a0965c61a836b7d7d9b37209a5c25818fee6196e2b4968c3dedea0dfc9ee034168cb21a138fcc453021857e8313f03911bdef8b65c211416cf70dec498bd9d SHA512 6c4fd3675df0d7674b9aea7993b99c3c6d75be60dce6ccc82f850deec21c301645c9bbc9cbbf9056f17c7861dd2416e1eb8f4c412c738a228ae85add041694c4
 EBUILD websocat-1.6.0-r2.ebuild 3509 BLAKE2B a48375a67c854791bbdcbb73efa2341d5a92a049472467c81b944b91a9c92e3f62a06b7f937e35e6a6989e9fba391ea1e59aa08be8d33ec9308b6598ad4aa5b1 SHA512 ff6afc98c373bae6c6afde2e8092e47f0cc959af8f91fc5b595934d8838ddc8c87a161e5adac42b9b6ddc0e5f76f1857da38a821f6a0fad600bd9b475459f82f
 EBUILD websocat-1.9.0.ebuild 3612 BLAKE2B 22caaa5d771f125afdea3015819470ceb2b433a548ba6a0a72bf18b559f9451f5ad2cb020324ec4f5ea258e3faae67e0a32e9f4f44dfa2d266526493c964de9e SHA512 e2a5de71b8bb8c2884d8998e8dd72bd9d2cd99897228a7411b026eb005e5b704bd338ed79b58c50de2697ee18dbf468bcabfe5fbfd463afc5b7de9af1cc4cd57
 MISC metadata.xml 451 BLAKE2B 833d2a6d39da6dd42db69c6428e70ba2cad341bce3643b90be6046f98f12675a7e5d76bfbc63006a74bc5232e95366544ac73f66c3ea38a78c6a7df56d82b88c SHA512 19793a68342f93c6e2ac264a25c5a6499c30593686b2b27c0359861380dc7de974cdae54bacae5461c6a856f14860d05b858f6b4a9aa20260b67e4ebe0f925ec
diff --git a/net-misc/websocat/websocat-1.10.0.ebuild b/net-misc/websocat/websocat-1.10.0.ebuild
new file mode 100644
index 000000000000..1b630fcbb054
--- /dev/null
+++ b/net-misc/websocat/websocat-1.10.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+aead-0.4.3
+anymap-0.12.1
+argon2-0.4.0
+atty-0.2.14
+autocfg-0.1.7
+autocfg-1.1.0
+base64ct-1.5.0
+base64-0.9.3
+base64-0.10.1
+bitflags-1.3.2
+blake2-0.10.4
+block-buffer-0.7.3
+block-buffer-0.10.2
+block-padding-0.1.5
+byteorder-1.4.3
+bytes-0.4.12
+byte-tools-0.3.1
+cc-1.0.71
+cfg-if-0.1.10
+cfg-if-1.0.0
+chacha20poly1305-0.9.0
+chacha20-0.8.1
+cipher-0.3.0
+clap-2.33.3
+cloudabi-0.0.3
+core-foundation-0.9.2
+core-foundation-sys-0.8.3
+cpufeatures-0.2.2
+crossbeam-deque-0.7.4
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.1.2
+crossbeam-queue-0.2.3
+crossbeam-utils-0.6.6
+crossbeam-utils-0.7.2
+crypto-common-0.1.3
+derivative-1.0.4
+digest-0.8.1
+digest-0.10.3
+env_logger-0.6.2
+fake-simd-0.1.2
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.31
+generic-array-0.12.4
+generic-array-0.14.5
+getrandom-0.2.3
+heck-0.3.3
+hermit-abi-0.1.19
+hex-0.4.3
+httparse-1.5.1
+http-0.1.21
+http-bytes-0.1.0
+hyper-0.10.16
+idna-0.1.5
+instant-0.1.12
+iovec-0.1.4
+itoa-0.4.8
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.105
+lock_api-0.3.4
+lock_api-0.4.7
+log-0.3.9
+log-0.4.14
+matches-0.1.9
+maybe-uninit-2.0.0
+memchr-2.5.0
+memoffset-0.5.6
+mime-0.2.6
+miow-0.2.2
+miow-0.3.7
+mio-0.6.23
+mio-named-pipes-0.1.7
+mio-uds-0.6.8
+native-tls-0.2.8
+net2-0.2.37
+num_cpus-1.13.0
+once_cell-1.8.0
+opaque-debug-0.2.3
+opaque-debug-0.3.0
+openssl-0.10.40
+openssl-macros-0.1.0
+openssl-probe-0.1.4
+openssl-src-111.18.0+1.1.1n
+openssl-sys-0.9.73
+parking_lot-0.9.0
+parking_lot-0.11.2
+parking_lot_core-0.6.2
+parking_lot_core-0.8.5
+password-hash-0.4.1
+percent-encoding-1.0.1
+pkg-config-0.3.22
+poly1305-0.7.2
+ppv-lite86-0.2.15
+proc-macro2-0.4.30
+proc-macro2-1.0.38
+prometheus-0.13.0
+prometheus-metric-storage-0.5.0
+prometheus-metric-storage-derive-0.5.0
+quote-0.6.13
+quote-1.0.18
+rand-0.6.5
+rand-0.8.4
+rand_chacha-0.1.1
+rand_chacha-0.3.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.6.3
+rand_hc-0.1.0
+rand_hc-0.3.1
+rand_isaac-0.1.1
+rand_jitter-0.1.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+readwrite-0.1.2
+redox_syscall-0.1.57
+redox_syscall-0.2.10
+remove_dir_all-0.5.3
+rustc_version-0.2.3
+safemem-0.3.3
+schannel-0.1.19
+scopeguard-1.1.0
+security-framework-2.4.2
+security-framework-sys-2.4.2
+semver-0.9.0
+semver-parser-0.7.0
+sha-1-0.8.2
+signal-hook-registry-1.4.0
+slab-0.4.5
+slab_typesafe-0.1.3
+smallvec-0.6.14
+smallvec-1.8.0
+smart-default-0.3.0
+structopt-0.2.16
+structopt-derive-0.2.16
+subtle-2.4.1
+syn-0.15.44
+syn-1.0.94
+tempfile-3.2.0
+textwrap-0.11.0
+thiserror-1.0.31
+thiserror-impl-1.0.31
+time-0.1.43
+tinyvec-1.5.0
+tinyvec_macros-0.1.0
+tk-listen-0.2.1
+tokio-0.1.22
+tokio-codec-0.1.2
+tokio-current-thread-0.1.7
+tokio-executor-0.1.10
+tokio-file-unix-0.5.1
+tokio-fs-0.1.7
+tokio-io-0.1.13
+tokio-named-pipes-0.1.0
+tokio-process-0.2.5
+tokio-reactor-0.1.12
+tokio-signal-0.2.9
+tokio-stdin-stdout-0.1.5
+tokio-sync-0.1.8
+tokio-tcp-0.1.4
+tokio-threadpool-0.1.18
+tokio-timer-0.2.13
+tokio-tls-0.2.1
+tokio-udp-0.1.6
+tokio-uds-0.2.7
+traitobject-0.1.0
+typeable-0.1.2
+typenum-1.14.0
+unicase-1.4.2
+unicode-bidi-0.3.7
+unicode-ident-1.0.1
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.9
+unicode-xid-0.1.0
+unicode-xid-0.2.3
+universal-hash-0.4.1
+url-1.7.2
+vcpkg-0.2.15
+version_check-0.1.5
+version_check-0.9.4
+wasi-0.10.2+wasi-snapshot-preview1
+websocat-1.10.0
+websocket-0.26.2
+websocket-base-0.26.2
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-sys-0.36.1
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+ws2_32-sys-0.2.1
+zeroize-1.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions"
+HOMEPAGE="https://github.com/vi/websocat"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ssl"
+RESTRICT+=" test"
+
+RDEPEND="
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+DEPEND="
+	${RUST_DEPEND}
+	${RDEPEND}
+"
+QA_FLAGS_IGNORED="/usr/bin/websocat"
+
+src_configure() {
+	local myfeatures=(
+		$(usex ssl ssl '')
+		seqpacket
+		signal_handler
+		tokio-process
+		unix_stdio
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+	dodoc *.md
+}
diff --git a/net-misc/websocketd/Manifest b/net-misc/websocketd/Manifest
index fe3afa6a5093..2ee452d83cef 100644
--- a/net-misc/websocketd/Manifest
+++ b/net-misc/websocketd/Manifest
@@ -1,5 +1,4 @@
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
+DIST websocketd-0.4.1-deps.tar.xz 109852 BLAKE2B 984d4a5af172199c21fafad064ff137e65ce7d66db9977ea4f9b74b147e7e41ddb7fe45d1211d03ea83c7ecf8b23fddce86cb8dce2e6d3e7e85dd0ea0b9e9387 SHA512 73c60a6b8f892a61c4bc2313c52742c36ea9cbf250948b1c23903d67c1e103848741cf6997d0c1f201056bc8d7c65f5e35a8c9f3ab9dbb04fb4b3995895a6a15
 DIST websocketd-0.4.1.tar.gz 46366 BLAKE2B 8b2fd1b63736cb47363e512044cb22a6eaa726c471289dbd1a6b77733d64b3023eddadd47a82357aec4bcbe097ce2b90806284f4483a36d2cf446d4eef66c224 SHA512 8535637bdf8fecbc4340606b6096672420126c32ed9e68944593f577e6307c810caf654e76f7077bf119d6273c6eec4c4c21eb21bfd805d0b8f5549c626460e4
-EBUILD websocketd-0.4.1.ebuild 736 BLAKE2B b93da8ffc1bb3762fb987647b541b5bcb3a4732f57391c631280a504515e2bf769d939c41d6b21cbdb90429529d84f3e7769e442c10bfc3e07db1f11bcb031bc SHA512 241df086228d8036dcef1d5ddb5cc1fcfe1322085ef6ca0fde923538234c1602cd49e32734d2744380c510d1fa8c6bca11287635527db8b813ff8a0ee55c3255
+EBUILD websocketd-0.4.1.ebuild 657 BLAKE2B b4435e5a530d27d1476fb6e761d78bdd9f7403b93157af771b159c37c5cdfe22c2cf09b9302c766c127a19a6f79ed11585046e17ddee3817c558172a77d3681a SHA512 565340b2b295a5e1a05ae018f0fde513fbbcb413ef221e28b44b661a61d0e78724f299f5056b76c81995d328bf0c02e9a4be8faa4b6a02415e9138cf59773959
 MISC metadata.xml 304 BLAKE2B 52cb3bbea8b0f20effed18bba6fde0ef8e73d862d30e279c22c5fb49aad5f0d887dd5538d9eaf29ee15261a7ed04bd0f74746b118ad0934b397d19e687572f53 SHA512 036653c438bcd6345dbd2a355cecc790459922fd2a61bca37f17d1abdfbcf43aaf2548a4bbf8c26d1f649279fee0699042be09b83db70b429acedf90628d998d
diff --git a/net-misc/websocketd/websocketd-0.4.1.ebuild b/net-misc/websocketd/websocketd-0.4.1.ebuild
index 3e47380c1fb4..b8920a74a1cd 100644
--- a/net-misc/websocketd/websocketd-0.4.1.ebuild
+++ b/net-misc/websocketd/websocketd-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,16 +11,9 @@ DESCRIPTION="Like inetd, but for WebSockets"
 HOMEPAGE="https://github.com/joewalnes/websocketd"
 SLOT="0"
 LICENSE="BSD-2"
-
-EGO_SUM=(
-"github.com/gorilla/websocket v1.4.0"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-)
-
-go-module_set_globals
 SRC_URI="
 	${ARCHIVE_URI}
-	${EGO_SUM_SRC_URI}
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
 "
 
 src_compile() {
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index ecfd00f283dd..2fcde3ecf7e0 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,6 +1,8 @@
+AUX wget-1.21.3-hsts-type.patch 8463 BLAKE2B ebee8872161ba4a0288ee973d1edb5d38740dac09e5d6807627bed76d05f167aa4b0a79b48f45b0933bc8444c3977ddfa570591e590ea466149cfc81b5e35789 SHA512 983ce2e62bf8f4562072644d8583eecb491c27b703f2ff9eef818557ecb8d7c64d2f0b764f2dd41a270e52513455f0102b79e90e03420b46b868e832f28c6b4f
 DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
 DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
 EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9
-EBUILD wget-1.21.3.ebuild 3211 BLAKE2B d7e79dcb543bb11440a42c7a016f8f0acea77b0df425c31d7361cd89bf16b33a3d4b1ee390764355c820ba681d04f04167e8ae64ea205bd936a4ade4234dd8f2 SHA512 308a901a46b044c3e2b0786a67e1c1bf323e0cda062171511d3971d34887be1fb50f97af8fe6fc7e50e9b78f09e3877b1cfcabb63328bd053b9bd227047e1ecd
-MISC metadata.xml 740 BLAKE2B 1b36b1f6e8add5fcbbc757974dd8d9f89b4fb62ad1cdde882ec464e2348773e28f923c89259fa56b8d080be1b1975d91c113e4f10553fdd87c3d270bf29c393d SHA512 25e2e34967bd2a04f5aae19849353c798084031888a3aa300a4f9d4ef9029c41a4cc013a842c906dcc2720af155085e047ed99e45a102589f59625bc60042238
+EBUILD wget-1.21.3-r1.ebuild 3260 BLAKE2B fc3207fe851535b13d306193500a9610461d6d655d14544fec8bc5bfa41689604b5656dbcb4ae2a0120a6c5fbd28ab34a5419fb08bc2a65c11b2c06174fdd555 SHA512 6aa9368503381bdb747844994706f010a772cca1c34126c4ca0bd25e22492afd1427d1036892f3eed870b9a7f7993ef2983317848c47be21a988b149ee88f69a
+EBUILD wget-1.21.3.ebuild 3203 BLAKE2B fb43f5fdfe06d756846ed4eb98869777643b7c0cfd373d1ebd6b81bf5067ea74bbb967aaf3549c3544bfd462db81fc20df837b0388624aeacce261a8522d44c7 SHA512 a1008cb3d17be6f4cbf0e6aae87b8891b5d555a6d6967e227383881664e828865f8c8c2e87f8df8308d6d7e500cd1660085dfb16ad241b436bff8f13830b9c73
+MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
diff --git a/net-misc/wget/files/wget-1.21.3-hsts-type.patch b/net-misc/wget/files/wget-1.21.3-hsts-type.patch
new file mode 100644
index 000000000000..bac1330ddc79
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21.3-hsts-type.patch
@@ -0,0 +1,211 @@
+https://bugs.gentoo.org/850676
+https://git.savannah.gnu.org/cgit/wget.git/commit/?id=cb114fbbf73eb687d28b01341c8d4266ffa96c9d
+
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sun, 20 Mar 2022 12:18:20 +0100
+Subject: Fix HSTS portability by using int64_t instead of time_t.
+
+* src/hsts.c: Use int64_t instead of time_t.
+* src/http.c: Use int64_t for parsing Strict-Transport-Security.
+--- a/src/hsts.c
++++ b/src/hsts.c
+@@ -61,8 +61,8 @@ struct hsts_kh {
+ };
+ 
+ struct hsts_kh_info {
+-  time_t created;
+-  time_t max_age;
++  int64_t created;
++  int64_t max_age;
+   bool include_subdomains;
+ };
+ 
+@@ -166,7 +166,7 @@ end:
+ static bool
+ hsts_new_entry_internal (hsts_store_t store,
+                          const char *host, int port,
+-                         time_t created, time_t max_age,
++                         int64_t created, int64_t max_age,
+                          bool include_subdomains,
+                          bool check_validity,
+                          bool check_expired,
+@@ -216,21 +216,21 @@ bail:
+ static bool
+ hsts_add_entry (hsts_store_t store,
+                 const char *host, int port,
+-                time_t max_age, bool include_subdomains)
++                int64_t max_age, bool include_subdomains)
+ {
+-  time_t t = time (NULL);
++  int64_t t = (int64_t) time (NULL);
+ 
+   /* It might happen time() returned -1 */
+-  return (t == (time_t)(-1) ?
++  return (t == -1) ?
+       false :
+-      hsts_new_entry_internal (store, host, port, t, max_age, include_subdomains, false, true, false));
++      hsts_new_entry_internal (store, host, port, t, max_age, include_subdomains, false, true, false);
+ }
+ 
+ /* Creates a new entry, unless an identical one already exists. */
+ static bool
+ hsts_new_entry (hsts_store_t store,
+                 const char *host, int port,
+-                time_t created, time_t max_age,
++                int64_t created, int64_t max_age,
+                 bool include_subdomains)
+ {
+   return hsts_new_entry_internal (store, host, port, created, max_age, include_subdomains, true, true, true);
+@@ -245,7 +245,7 @@ hsts_remove_entry (hsts_store_t store, struct hsts_kh *kh)
+ static bool
+ hsts_store_merge (hsts_store_t store,
+                   const char *host, int port,
+-                  time_t created, time_t max_age,
++                  int64_t created, int64_t max_age,
+                   bool include_subdomains)
+ {
+   enum hsts_kh_match match_type = NO_MATCH;
+@@ -276,11 +276,11 @@ hsts_read_database (hsts_store_t store, FILE *fp, bool merge_with_existing_entri
+   size_t len = 0;
+   int items_read;
+   bool result = false;
+-  bool (*func)(hsts_store_t, const char *, int, time_t, time_t, bool);
++  bool (*func)(hsts_store_t, const char *, int, int64_t, int64_t, bool);
+ 
+   char host[256];
+   int port;
+-  time_t created, max_age;
++  int64_t created, max_age;
+   int include_subdomains;
+ 
+   func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry);
+@@ -326,10 +326,9 @@ hsts_store_dump (hsts_store_t store, FILE *fp)
+       struct hsts_kh *kh = (struct hsts_kh *) it.key;
+       struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value;
+ 
+-      if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n",
++      if (fprintf (fp, "%s\t%d\t%d\t%" PRId64 "\t%" PRId64 "\n",
+                    kh->host, kh->explicit_port, khi->include_subdomains,
+-                   (unsigned long) khi->created,
+-                   (unsigned long) khi->max_age) < 0)
++                   khi->created, khi->max_age) < 0)
+         {
+           logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n");
+           break;
+@@ -439,7 +438,7 @@ hsts_match (hsts_store_t store, struct url *u)
+ bool
+ hsts_store_entry (hsts_store_t store,
+                   enum url_scheme scheme, const char *host, int port,
+-                  time_t max_age, bool include_subdomains)
++                  int64_t max_age, bool include_subdomains)
+ {
+   bool result = false;
+   enum hsts_kh_match match = NO_MATCH;
+@@ -464,9 +463,9 @@ hsts_store_entry (hsts_store_t store,
+                * 'created' field too. The RFC also states that we have to
+                * update the entry each time we see HSTS header.
+                * See also Section 11.2. */
+-              time_t t = time (NULL);
++              int64_t t = (int64_t) time (NULL);
+ 
+-              if (t != (time_t)(-1) && t != entry->created)
++              if (t != -1 && t != entry->created)
+                 {
+                   entry->created = t;
+                   entry->max_age = max_age;
+@@ -792,7 +791,7 @@ test_hsts_read_database (void)
+   hsts_store_t table;
+   char *file = NULL;
+   FILE *fp = NULL;
+-  time_t created = time(NULL) - 10;
++  int64_t created = time(NULL) - 10;
+ 
+   if (opt.homedir)
+     {
+@@ -801,9 +800,9 @@ test_hsts_read_database (void)
+       if (fp)
+         {
+           fputs ("# dummy comment\n", fp);
+-          fprintf (fp, "foo.example.com\t0\t1\t%lu\t123\n",(unsigned long) created);
+-          fprintf (fp, "bar.example.com\t0\t0\t%lu\t456\n", (unsigned long) created);
+-          fprintf (fp, "test.example.com\t8080\t0\t%lu\t789\n", (unsigned long) created);
++          fprintf (fp, "foo.example.com\t0\t1\t%" PRId64 "\t123\n", created);
++          fprintf (fp, "bar.example.com\t0\t0\t%" PRId64 "\t456\n", created);
++          fprintf (fp, "test.example.com\t8080\t0\t%" PRId64 "\t789\n", created);
+           fclose (fp);
+ 
+           table = hsts_store_open (file);
+--- a/src/hsts.h
++++ b/src/hsts.h
+@@ -46,7 +46,7 @@ bool hsts_store_has_changed (hsts_store_t);
+ 
+ bool hsts_store_entry (hsts_store_t,
+                        enum url_scheme, const char *, int,
+-                       time_t, bool);
++                       int64_t, bool);
+ bool hsts_match (hsts_store_t, struct url *);
+ 
+ #endif /* HAVE_HSTS */
+--- a/src/http.c
++++ b/src/http.c
+@@ -1300,7 +1300,7 @@ parse_content_disposition (const char *hdr, char **filename)
+ 
+ #ifdef HAVE_HSTS
+ static bool
+-parse_strict_transport_security (const char *header, time_t *max_age, bool *include_subdomains)
++parse_strict_transport_security (const char *header, int64_t *max_age, bool *include_subdomains)
+ {
+   param_token name, value;
+   const char *c_max_age = NULL;
+@@ -1330,7 +1330,7 @@ parse_strict_transport_security (const char *header, time_t *max_age, bool *incl
+            * Also, time_t is normally defined as a long, so this should not break.
+            */
+           if (max_age)
+-            *max_age = (time_t) strtol (c_max_age, NULL, 10);
++            *max_age = (int64_t) strtoll (c_max_age, NULL, 10);
+           if (include_subdomains)
+             *include_subdomains = is;
+ 
+@@ -3184,9 +3184,6 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs,
+ #else
+   extern hsts_store_t hsts_store;
+ #endif
+-  const char *hsts_params;
+-  time_t max_age;
+-  bool include_subdomains;
+ #endif
+ 
+   int sock = -1;
+@@ -3674,21 +3671,24 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs,
+ #ifdef HAVE_HSTS
+   if (opt.hsts && hsts_store)
+     {
+-      hsts_params = resp_header_strdup (resp, "Strict-Transport-Security");
++      int64_t max_age;
++      const char *hsts_params = resp_header_strdup (resp, "Strict-Transport-Security");
++      bool include_subdomains;
++
+       if (parse_strict_transport_security (hsts_params, &max_age, &include_subdomains))
+         {
+           /* process strict transport security */
+           if (hsts_store_entry (hsts_store, u->scheme, u->host, u->port, max_age, include_subdomains))
+-            DEBUGP(("Added new HSTS host: %s:%u (max-age: %lu, includeSubdomains: %s)\n",
++            DEBUGP(("Added new HSTS host: %s:%" PRIu32 " (max-age: %" PRId64 ", includeSubdomains: %s)\n",
+                    u->host,
+-                   (unsigned) u->port,
+-                   (unsigned long) max_age,
++                   (uint32_t) u->port,
++                   max_age,
+                    (include_subdomains ? "true" : "false")));
+           else
+-            DEBUGP(("Updated HSTS host: %s:%u (max-age: %lu, includeSubdomains: %s)\n",
++            DEBUGP(("Updated HSTS host: %s:%" PRIu32 " (max-age: %" PRId64 ", includeSubdomains: %s)\n",
+                    u->host,
+-                   (unsigned) u->port,
+-                   (unsigned long) max_age,
++                   (uint32_t) u->port,
++                   max_age,
+                    (include_subdomains ? "true" : "false")));
+         }
+       xfree (hsts_params);
+cgit v1.1
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 574ac5004315..07aa81b0e850 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
-<use>
- <flag name="cookie-check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag>
- <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
- <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
- <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:gnu:wget</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="cookie-check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag>
+		<flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
+		<flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
+		<flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:wget</remote-id>
+		<remote-id type="gitlab">gnuwget/wget</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/wget/wget-1.21.3-r1.ebuild b/net-misc/wget/wget-1.21.3-r1.ebuild
new file mode 100644
index 000000000000..922b3579b4f0
--- /dev/null
+++ b/net-misc/wget/wget-1.21.3-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/wget.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+RESTRICT="!test? ( test )"
+
+# * Force a newer libidn2 to avoid libunistring deps. #bug #612498
+# * Metalink can use gpgme automagically (so let's always depend on it)
+# for signed metalink resources.
+LIB_DEPEND="
+	cookie-check? ( net-libs/libpsl )
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	metalink? (
+		app-crypt/gpgme
+		media-libs/libmetalink
+	)
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:=[static-libs(+)] )
+		!gnutls? ( dev-libs/openssl:=[static-libs(+)] )
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	verify-sig? ( sec-keys/openpgp-keys-wget )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hsts-type.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. # bug #612498
+	local myeconfargs=(
+		ac_cv_libunistring=no
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with cookie-check libpsl)
+		$(use_enable idn iri)
+		$(use_with metalink)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/wget/wget-1.21.3.ebuild b/net-misc/wget/wget-1.21.3.ebuild
index af2f49b03f74..3b93ad5504e4 100644
--- a/net-misc/wget/wget-1.21.3.ebuild
+++ b/net-misc/wget/wget-1.21.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 6889be2cae49..b617157a965a 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,4 +1,6 @@
 DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb
+DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
 EBUILD wget2-2.0.0-r1.ebuild 1848 BLAKE2B 29c9e15fa14842d81817b9638a36a2281175992d9704349f9f718b07c42174b7fc8588a41de668498537890abc3a84a21a896882a88074b5f06b80f657a08567 SHA512 cd96f2efa6b7e03fad24c35d6086110b8524d2a1e5138c561aa5ca418662ae571b61c091b1eb0c2a523a5bb9f960d9cf9c992d6d53437e2b614b6c6a37858bf5
+EBUILD wget2-2.0.1.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
 EBUILD wget2-9999.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
-MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40
+MISC metadata.xml 719 BLAKE2B 5461e4ca50d06c5f53726d5922ffdf72ca33beb77b093e64b7a0d0d2e62511c815d1aefd1bb0d8f2f066d466ecd11da2e2a3e8cfc3b4923abc20dc6900bbce6e SHA512 7d0ef8c43239610cc56574bcdf7d4b9e52abb9a3dfa39a24ab669ad3ab740587080f913c48311cf518026198d6ac6571dd7f96d8ba24154a64201e0cc5b8d7c0
diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml
index 5c9152ae45cd..7d7d6c67e605 100644
--- a/net-misc/wget2/metadata.xml
+++ b/net-misc/wget2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag>
diff --git a/net-misc/wget2/wget2-2.0.1.ebuild b/net-misc/wget2/wget2-2.0.1.ebuild
new file mode 100644
index 000000000000..57cdc0a2f977
--- /dev/null
+++ b/net-misc/wget2/wget2-2.0.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
+HOMEPAGE="https://gitlab.com/gnuwget/wget2"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
+else
+	SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3"
+SLOT="0/0" # subslot = libwget.so version
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzma openssl pcre psl +ssl test valgrind xattr zlib"
+REQUIRED_USE="valgrind? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli )
+	bzip2? ( app-arch/bzip2 )
+	!gnutls? ( dev-libs/libgcrypt:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	gpgme? (
+		app-crypt/gpgme:=
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	http2? ( net-libs/nghttp2 )
+	idn? ( net-dns/libidn2:= )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre2 )
+	psl? ( net-libs/libpsl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	valgrind? ( dev-util/valgrind )
+"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ "${PV}" == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib :-/
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+			--skip-po
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-plugin-support
+		--with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)"
+		--without-libidn
+		--without-libmicrohttpd
+		$(use_enable doc)
+		$(use_enable valgrind valgrind-tests)
+		$(use_enable xattr)
+		$(use_with brotli brotlidec)
+		$(use_with bzip2)
+		$(use_with gpgme)
+		$(use_with http2 libnghttp2)
+		$(use_with idn libidn2)
+		$(use_with lzma)
+		$(use_with pcre libpcre2)
+		$(use_with psl libpsl)
+		$(use_with zlib)
+
+		# Avoid calling ldconfig
+		LDCONFIG=:
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		if use doc ; then
+			local mpage
+			for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do
+				doman ${mpage}
+			done
+		fi
+	else
+		doman docs/man/man{1/*.1,3/*.3}
+	fi
+
+	find "${D}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/${PN}_noinstall || die
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 5a9f0ba59f9a..7c5c858be58d 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,7 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
-DIST whois-5.5.11.tar.gz 102806 BLAKE2B be1a5f04ee5af4987224151116d1d7e37ad580b8cc00c3fd4752e10b2cbc1dc46a528591cf75e95a83a99884c961f20865802246e00508c90e338590e7e0be37 SHA512 a7e400a727dd88b4c8f1df2e850879ece882b9af1d5daaff22bb3e1c88be01b4e5430f74f9d4afd4c73538d87022536e40d5f3f63a501a95845396fe0be595b4
 DIST whois_5.5.13.tar.xz 87384 BLAKE2B 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5 SHA512 b4a70cc6d58133287d70775ecd8173c255f800362639a3e2dea0d3d56c35405b7fc93c4c220cc50cbd15ae5ae402a59bd15f99e98a7cccb314f82a205aa7ee61
-EBUILD whois-5.5.11.ebuild 1941 BLAKE2B 22a19b0e416e2629a0970df690d373d6e0dc5892cdb672d159480c038c50b8b3ed5044e90a1620235feb39d5d20f697388803136c13182627848167d9054f143 SHA512 4f4bc41ac5754e630b3192f3550530e2656000c5d25e9665a8dc1e2dd3adfb3674139339ee2ca3586cdd3e2f70910c795b2aab0d7f63623d0337b40e90dc0b68
-EBUILD whois-5.5.13.ebuild 1946 BLAKE2B 0a8fa5aac6e378e825bc844c678adfba99ad6be0e7d6d37506012cf9ed72f5bd878f836330a18cbb16deb09c1929aa61c0c944ec91d27d653f2e4a85a1dc5822 SHA512 0497b1f0bbd7b8f41e3daa7cc4effbc9b0e1026ce818177a285fbd6d605953d81dd12585d9ac83365c622020dca088a9f98e3d42032bd527bb8e37a07b1713f9
+EBUILD whois-5.5.13-r1.ebuild 1803 BLAKE2B 34e8b346355983a98f296cae86cfa97640bf013f9782b175a5b4600debc18013f6b1fd0c87344549e00ba5d23b353674164b9689146819bafa6b31a0ed01acbf SHA512 18a4d7d29ac3bc975e14fb3fc29ca82173aa1bd095994fb8032be234f37b2c2f4f4de27f67e997e3874381f694e3a6b5be68fe2c965d410af7065920be43b504
 EBUILD whois-9999.ebuild 1955 BLAKE2B f1dc35b6b4907d25dc09adc21331b7b7af947f19de70541d477cd88fd59fa650145dce37748cb4c03baa3c69835e7c7f29e7cbbd7b5f1132c83038a535b3f70d SHA512 8e51c9fd5d12a919e77ce82c1a3f477976ca250dae9c6bd7cb32dcd940e9506c77da1342a3f3fbee25419de356de612b1f62cc8ace2f77c645286b253ebc3524
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.11.ebuild b/net-misc/whois/whois-5.5.11.ebuild
deleted file mode 100644
index 290ecaecebdc..000000000000
--- a/net-misc/whois/whois-5.5.11.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-RESTRICT="test" #59327
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
-	!xcrypt? ( virtual/libcrypt:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	use xcrypt && export HAVE_XCRYPT=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.13.ebuild b/net-misc/whois/whois-5.5.13-r1.ebuild
index c4823b0e0fb3..1c3e8e21b391 100644
--- a/net-misc/whois/whois-5.5.13.ebuild
+++ b/net-misc/whois/whois-5.5.13-r1.ebuild
@@ -17,7 +17,7 @@ else
 	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
@@ -75,9 +75,4 @@ src_install() {
 	insinto /etc
 	doins whois.conf
 	dodoc README debian/changelog
-
-	if ! use userland_GNU ; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
 }
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index a804303fd7c1..b24f4fd8af77 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -2,7 +2,9 @@ AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e1
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
 DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d
 DIST xmrig-6.17.0.tar.gz 2443393 BLAKE2B 01fa7682dae6dd4aaa0f3b677bedfb3b2e9de35799f9bae0aa1a733b35152d1d6c56dfed06b9aa54fe64df4f40029d2657b9fc95e541746bd8e28bff15eef96b SHA512 a8361a5ccc8237afb59c496d88d920b7222158d9f874ff891f0cb78278e6e00881b75f4e129858c44ffc7d90227c995121f6611f1a20f84139930a883271f0d6
+DIST xmrig-6.18.0.tar.gz 2389032 BLAKE2B c7561e2d9303c80f97615471a28f57bc48c93749459e48451de52d1130b436298354a0419c3ed3c96f2bfe3592b7d28f85b91c7698174917d6eb08b685a12145 SHA512 ed20b760ae7603de752c933513c3f7abb2e254a44d79252264952f3e70c7b5320389ed4f6534a6dc8eb7cac8b1086239c46baf18c71f7ba7f0018914b2fd5917
 EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
-EBUILD xmrig-6.17.0.ebuild 1341 BLAKE2B 4fd507e2a632944e37457aaba67f22031fbd7f39409f54b4818aa54606e66f2e72bc879093e1558247db5694add5b3b1963700b9ab7d05933962799d653d60b4 SHA512 4618b630f836af9d623c0b72460546c1f16c7f7d5b2c6db5275fe81a3c7e630670c8b975485dcdba976009b3df16a21cbeabd3a755e3b43cd7d43099a9da4f34
-EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+EBUILD xmrig-6.17.0.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
+EBUILD xmrig-6.18.0.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
+EBUILD xmrig-9999.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
 MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39
diff --git a/net-misc/xmrig/xmrig-6.17.0.ebuild b/net-misc/xmrig/xmrig-6.17.0.ebuild
index 0b726e03276b..1b72caa1898c 100644
--- a/net-misc/xmrig/xmrig-6.17.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-misc/xmrig/xmrig-6.18.0.ebuild b/net-misc/xmrig/xmrig-6.18.0.ebuild
new file mode 100644
index 000000000000..5e038e700270
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.18.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 516d44208bba..5e038e700270 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd
 
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 5eed014b903c..98957596a43d 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,3 +1,7 @@
-DIST yt-dlp-2022.4.8.tar.gz 2257195 BLAKE2B 1d83ef14900789d0af0fc80bafcd6d80ca3162ede818d74382598161014c1a4c4450c0cdf57cdc79f3c5e2970a46004619eeffa9dfdb0d7af128bbe2a023ebf8 SHA512 b2d865682ba44dbd168cd76089105fc1d7ff2d79ba884c9626b3a4009c05f07eccaed2b8801318e89e3e197affc70aad68c1813590eef2a5148ded9c037bf0ce
-EBUILD yt-dlp-2022.4.8.ebuild 1885 BLAKE2B f3f160e116976414a446feaa719a6da7bc4a046044a0e7731776322b27a1b2f999c498ff03fde4ae275fae29af08147abad25b93845700bbf63d5543ed46fc68 SHA512 805bda576fb2a811bb92820bafda501b02e2365bafdd9454957cfb0757547a769869475adb39eab666d2168ffe4151c9ad99bfb9e9539201c4dd8151d7969239
+DIST yt-dlp-2022.5.18.tar.gz 2277146 BLAKE2B 95237fcb12aef9d849e5cc5603baeb5b8e6f416db2dad04d8ea7408b966dcd0d05ad3e276342fb9cc3551293a569b48d2b806c360e95c9c96ffb17dff4cbeb9a SHA512 d0c11e6dba336124898e73234c5935386163af8a9dbbe3e2c38ec834ff631557a763e5224c30747dcffcf98364b95b7f1b6121c50ef91ed56653e2ce453548b5
+DIST yt-dlp-2022.6.22.1.tar.gz 2314891 BLAKE2B 4c3e854f89281be9c8c301be0ebaf27434f04a6e26f7fe3bbb60e4d68d36605d5d2fce8ae9245c5e6421913bea90cbd4030d30babed81bdd9df56c3c73dfbcdc SHA512 0a0a4b25e0a75774bc659770af7d83a307d2ff4a3eef11c02ca422c0f4920ba47e02350cd72a4c4a4903aa7f97879b979c755318d3b48def6be738e09d72c3c6
+DIST yt-dlp-2022.6.29.tar.gz 2321677 BLAKE2B c1c6e18af961c7d433fae432ecf38feb28bff315ad9a3949c431f35f46a469460ade8a44e23f699d248dee1088bd507981479ab009c3e8152508c730ff146683 SHA512 f6832e70a73a3b787af9a9e2c4219bd593d2eb0e4c37a0d5696a5a11413a7230f4ca5e480db43713477fba6eae076c600ec98f24adb5c651fa5fbb9fdd83ad45
+EBUILD yt-dlp-2022.5.18.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
+EBUILD yt-dlp-2022.6.22.1.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
+EBUILD yt-dlp-2022.6.29.ebuild 1829 BLAKE2B 653c11229a14a5f360e24041cee0610d843fd31127712a2460d9d3096a579ad32afb9b09f6eb69fc4695f839c7503bbec0637fb052b2687e86d7439499dfb268 SHA512 be1ee1cc642fa36d49dc26737e8eba82e63c49b01e864c757923ce0021e07dcda1e6823400eecaadf3cfcd3b4b784d64606bbb801acde5e064ef14b32f02cdeb
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild b/net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild
index 2ffa0d03e5d3..705a62db9da4 100644
--- a/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild
@@ -4,11 +4,11 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 optfeature
+PYTHON_COMPAT=( python3_{8..11} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
 
 DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
 SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
@@ -21,8 +21,8 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
+src_prepare() {
+	distutils-r1_src_prepare
 
 	# adjust requires for pycryptodome and optional dependencies (bug #828466)
 	sed -ri requirements.txt \
@@ -31,7 +31,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	epytest -m 'not download' -p no:markdown
+	epytest -m 'not download'
 }
 
 python_install_all() {
@@ -48,10 +48,7 @@ python_install_all() {
 
 	rm -r "${ED}"/usr/share/doc/yt_dlp || die
 
-	newbin - youtube-dl <<-EOF
-		#!/usr/bin/env sh
-		exec yt-dlp --compat-options youtube-dl "\${@}"
-	EOF
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
 }
 
 pkg_postinst() {
diff --git a/net-misc/yt-dlp/yt-dlp-2022.6.22.1.ebuild b/net-misc/yt-dlp/yt-dlp-2022.6.22.1.ebuild
new file mode 100644
index 000000000000..705a62db9da4
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2022.6.22.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri requirements.txt \
+		-e "s/^(pycryptodome)x/\1/" \
+		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
+}
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild b/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild
new file mode 100644
index 000000000000..775abf17078d
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri requirements.txt \
+		-e "s/^(pycryptodome)x/\1/" \
+		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
+}
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 010e614609f4..fa89427e0ea7 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,3 +1,5 @@
 DIST ytfzf-2.3.tar.gz 3249215 BLAKE2B 963442379ea324aa6f7b4077df417815ec1e1822d1598029efd397e2a29996ae92aa2f18e67ec6f7fea16a5804d3a7875cec625be1f5f49eb35c85dc84f3a894 SHA512 a282f578459ec53e725d1089a5b5efb78dcc66684ce572d0318f6bfd6e222b706418c77eeeca34d4015ed2bae1cb54de10edaab36522d6012c2ac421796ef34b
+DIST ytfzf-2.4.0.tar.gz 3253168 BLAKE2B e25bd13c01f5b035378dd6657358bc2ec67ff29f1db42fc8c07f0f820252efa4e6da6342265ea4107ec3179d317ac9742646a641a1c9e4e2a84360b39df6bf3d SHA512 9b66d8b56bb8a35baf04a5d34614882f8302e2f543d12182188438c50a76cca1182d7ac3a4a7a3d80d7c924478fd3af7968701e5d5ab8531a9d6f4ed5b731ece
 EBUILD ytfzf-2.3.ebuild 1497 BLAKE2B 168bd27352e08dcd0315da0067132a4ff73b852a4f464786a2e21fe10631d6a74769ecb267f346e96c73c7b0ff81580f4d1f010cec88ef068a86e64761e31121 SHA512 fdeac28e638efb39676f03f7087d533490e1d5104c53891be7c86ffbaab3fea779b075c6c0f649b620e05c71ac71c268d41cce5bd6379fa16ff0fe1f5ce4da47
+EBUILD ytfzf-2.4.0.ebuild 1497 BLAKE2B 168bd27352e08dcd0315da0067132a4ff73b852a4f464786a2e21fe10631d6a74769ecb267f346e96c73c7b0ff81580f4d1f010cec88ef068a86e64761e31121 SHA512 fdeac28e638efb39676f03f7087d533490e1d5104c53891be7c86ffbaab3fea779b075c6c0f649b620e05c71ac71c268d41cce5bd6379fa16ff0fe1f5ce4da47
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.4.0.ebuild b/net-misc/ytfzf/ytfzf-2.4.0.ebuild
new file mode 100644
index 000000000000..aabfab731b1b
--- /dev/null
+++ b/net-misc/ytfzf/ytfzf-2.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
+HOMEPAGE="https://github.com/pystardust/ytfzf/"
+SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+# fzf/mpv/yt-dlp "can" be optfeatures depending on configuration, but depend
+# on them so it works as expected out-of-the-box while allowing to disable.
+RDEPEND="
+	app-misc/jq
+	net-misc/curl[ssl]
+	virtual/awk
+	!minimal? (
+		app-shells/fzf
+		media-video/mpv[lua]
+		net-misc/yt-dlp
+	)"
+
+src_prepare() {
+	default
+
+	sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	emake "${emakeargs[@]}" addons doc install
+	einstalldocs
+
+	rm -r "${ED}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	optfeature "external menu support" x11-misc/dmenu
+	optfeature "in-terminal thumbnails on X11" media-gfx/ueberzug
+	optfeature "desktop notifications" x11-libs/libnotify
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that ${PN} supports many methods to display menus/thumbnails."
+		elog "This ebuild primarily covers defaults and major features, additional"
+		elog "dependencies may be needed for others."
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-misc
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)